branch stack/remove_webmotion updated (11d4b71c -> ed1d38b0)
This is an automated email from the git hooks/post-receive script. New change to branch stack/remove_webmotion in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits 11d4b71c Remove webmotion omits 648616c7 Indent component omits 249e1ffd Prevent error on loading pollen while disconnected adds a6c6d634 Fix purgeOldVotes cron adds f01fcc0c Prevent error on loading pollen while disconnected adds e05d92c3 Indent component new ed1d38b0 Remove webmotion This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (11d4b71c) \ N -- N -- N refs/heads/stack/remove_webmotion (ed1d38b0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ed1d38b0dad5b92de5f3bcf7e6d6120ef69910d3 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Oct 21 14:14:32 2019 +0200 Remove webmotion Summary of changes: .../pollen/persistence/entity/VoteTopiaDao.java | 2 +- .../pollen/services/service/VoteServiceTest.java | 30 +++++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch stack/remove_webmotion in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit ed1d38b0dad5b92de5f3bcf7e6d6120ef69910d3 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Oct 21 14:14:32 2019 +0200 Remove webmotion --- pollen-rest-api/pom.xml | 1 - .../pollen/rest/api/PollenRestApiApplication.java | 2 - .../java/org/chorem/pollen/rest/api/v1/DocApi.java | 63 ------- pollen-rest-api/src/main/resources/mapping | 208 --------------------- 4 files changed, 274 deletions(-) diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 75c62f34..5baabcab 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -263,7 +263,6 @@ <resource> <directory>src/main/resources</directory> <includes> - <include>**/mapping</include> <include>**/*.properties</include> <include>**/*.jpg</include> </includes> diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplication.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplication.java index 32bfed06..64ca543e 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplication.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplication.java @@ -42,7 +42,6 @@ import org.chorem.pollen.rest.api.v1.AuthApi; import org.chorem.pollen.rest.api.v1.ChoiceApi; import org.chorem.pollen.rest.api.v1.CommentApi; import org.chorem.pollen.rest.api.v1.TransverseApi; -import org.chorem.pollen.rest.api.v1.DocApi; import org.chorem.pollen.rest.api.v1.FavoriteListApi; import org.chorem.pollen.rest.api.v1.FeedbackApi; import org.chorem.pollen.rest.api.v1.GtuApi; @@ -72,7 +71,6 @@ public class PollenRestApiApplication extends Application { new ChoiceApi(), new CommentApi(), new TransverseApi(), - new DocApi(), new FavoriteListApi(), new PollApi(), new PollenResourceApi(), diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/DocApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/DocApi.java deleted file mode 100644 index 7b5b399d..00000000 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/DocApi.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.chorem.pollen.rest.api.v1; - -/* - * #%L - * Pollen :: Rest Api - * %% - * Copyright (C) 2009 - 2017 Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import org.apache.commons.io.IOUtils; -import org.chorem.pollen.services.PollenTechnicalException; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; - -/** - * Created on 4/29/14. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 2.0 - */ -@Path("") -public class DocApi { - - @Path("/doc") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String showMapping() { - - InputStream mappingUrl = getClass().getResourceAsStream("/mapping"); - - try { - - String content = IOUtils.toString(mappingUrl, StandardCharsets.UTF_8); - return content; - - } catch (IOException e) { - - throw new PollenTechnicalException(e); - - } - - } -} diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping deleted file mode 100644 index de064f7a..00000000 --- a/pollen-rest-api/src/main/resources/mapping +++ /dev/null @@ -1,208 +0,0 @@ -### -# #%L -# Pollen :: Rest Api -# %% -# Copyright (C) 2009 - 2014 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### - -### -# Pollen version : ${project.version} -### - -[config] -package.filters=org.chorem.pollen.rest.api -package.actions=org.chorem.pollen.rest.api.v1 -package.errors=org.chorem.pollen.rest.api.v1 -server.listener.class=org.chorem.pollen.rest.api.PollenRestApiApplicationListener -default.render=org.chorem.pollen.rest.api.PollenRender - -[filters] -* /* PollenRestApiRequestFilter.inject - -[errors] - -org.chorem.pollen.services.service.security.PollenAuthenticationException ErrorAction.on401 -org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException ErrorAction.on401 -org.chorem.pollen.services.service.security.PollenUnauthorizedException ErrorAction.on403 -org.chorem.pollen.services.service.security.PollenEmailNotValidatedException ErrorAction.on403 -org.chorem.pollen.services.service.security.PollenInvalidPermissionException ErrorAction.on403 -org.chorem.pollen.services.service.security.PollenInvalidEmailActivationTokenException ErrorAction.on403 -org.chorem.pollen.services.service.InvalidFormException ErrorAction.on400Form -org.chorem.pollen.services.service.FavoriteListImportException ErrorAction.on400Import -org.nuiton.topia.persistence.TopiaNoResultException ErrorAction.on404 -org.chorem.pollen.services.service.InvalidEntityLinkException ErrorAction.on404 - -[actions] - -# DocApi - -GET /v1/doc DocApi.showMapping - -# AuthApi - -POST,PUT /v1/login AuthApi.login -POST,PUT /v1/login2 AuthApi.login2 -GET /v1/lostpassword/{login} AuthApi.lostPassword -GET /v1/logout AuthApi.logout -POST,PUT /v1/resendValidation AuthApi.resendValidation - -# ChoiceApi - -GET /v1/polls/{pollId}/choices ChoiceApi.getChoices -POST /v1/polls/{pollId}/choices ChoiceApi.addChoice -GET /v1/polls/{pollId}/choices/{choiceId} ChoiceApi.getChoice -POST /v1/polls/{pollId}/choices/{choiceId}/reports ChoiceApi.addReport -GET /v1/polls/{pollId}/choices/{choiceId}/reports ChoiceApi.getReports -POST /v1/polls/{pollId}/choices/{choiceId}/reports/{reportId} ChoiceApi.saveReport - -#fix me -POST,PUT /v1/polls/{pollId}/choices/{choiceId} ChoiceApi.editChoice - -DELETE /v1/polls/{pollId}/choices/{choiceId} ChoiceApi.deleteChoice - -# CommentApi - -GET /v1/polls/{pollId}/comments CommentApi.getComments -POST /v1/polls/{pollId}/comments CommentApi.addComment -GET /v1/polls/{pollId}/comments/new CommentApi.getNewComment -GET /v1/polls/{pollId}/comments/{commentId} CommentApi.getComment -PUT,POST /v1/polls/{pollId}/comments/{commentId} CommentApi.editComment -DELETE /v1/polls/{pollId}/comments/{commentId} CommentApi.deleteComment -POST /v1/polls/{pollId}/comments/{commentId}/reports CommentApi.addReport -GET /v1/polls/{pollId}/comments/{commentId}/reports CommentApi.getReports -POST /v1/polls/{pollId}/comments/{commentId}/reports/{reportId} CommentApi.saveReport - -# FavoriteListApi - -GET /v1/favoriteLists FavoriteListApi.getFavoriteLists -GET /v1/favoriteLists/exports FavoriteListApi.exportFavoriteLists -POST /v1/favoriteLists/imports FavoriteListApi.importFavoriteLists -GET /v1/favoriteLists/{favoriteListId} FavoriteListApi.getFavoriteList -POST /v1/favoriteLists/{favoriteListId}/importCsv FavoriteListApi.importFavoriteListMembersFromCsv -POST /v1/favoriteLists/{favoriteListId}/importLdap FavoriteListApi.importFavoriteListMembersFromLdap -POST /v1/favoriteLists/importVoterList FavoriteListApi.importFavoriteListMembersFromVoterList -POST /v1/favoriteLists FavoriteListApi.createFavoriteList -PUT,POST /v1/favoriteLists/{favoriteListId} FavoriteListApi.editFavoriteList -DELETE /v1/favoriteLists/{favoriteListId} FavoriteListApi.deleteFavoriteList -GET /v1/favoriteLists/{favoriteListId}/members FavoriteListApi.getMembers -GET /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.getMember -POST /v1/favoriteLists/{favoriteListId}/members FavoriteListApi.addMember -PUT,POST /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.editMember -DELETE /v1/favoriteLists/{favoriteListId}/members/{memberId} FavoriteListApi.removeMember -GET /v1/favoriteLists/{favoriteListId}/lists FavoriteListApi.getChildrenLists -GET /v1/favoriteLists/{favoriteListId}/lists/{childListId} FavoriteListApi.getChildList -POST /v1/favoriteLists/{favoriteListId}/lists FavoriteListApi.addChildList -PUT,POST /v1/favoriteLists/{favoriteListId}/lists/{childListId} FavoriteListApi.editChildList -DELETE /v1/favoriteLists/{favoriteListId}/lists/{childListId} FavoriteListApi.removeChildList -GET /v1/favoriteLists/{favoriteListId}/all FavoriteListApi.getAllChildren - -# PollApi - -GET /v1/polls/new PollApi.getNewPoll -GET /v1/polls PollApi.getPolls -GET /v1/polls/created PollApi.getCreatedPolls -GET /v1/polls/invited PollApi.getInvitedPolls -GET /v1/polls/participated PollApi.getParticipatedPolls -POST /v1/polls PollApi.createPoll -#fix me -POST,PUT /v1/polls/{pollId} PollApi.editPoll - -GET /v1/polls/{pollId} PollApi.getPoll -DELETE /v1/polls/{pollId} PollApi.deletePoll - -POST /v1/polls/{pollId}/clone PollApi.clonePoll - -GET /v1/polls/{pollId}/export PollApi.exportPoll -PUT /v1/polls/{pollId}/close PollApi.closePoll -PUT /v1/polls/{pollId}/reopen PollApi.reopenPoll -PUT /v1/polls/{pollId}/assign PollApi.assignPoll - -GET /v1/polls/{pollId}/feed PollApi.getFeedForPoll - -POST /v1/polls/{pollId}/reports PollApi.addReport -GET /v1/polls/{pollId}/reports PollApi.getReports -POST /v1/polls/{pollId}/reports/{reportId} PollApi.saveReport - -# PollenResourceApi - -GET /v1/resources/{resourceId} PollenResourceApi.getResource -GET /v1/resources/{resourceId}/download PollenResourceApi.getDownloadResource -GET /v1/resources/{resourceId}/meta PollenResourceApi.getMetaResource -GET /v1/resources/{resourceId}/preview PollenResourceApi.getPreviewResource -POST /v1/resources PollenResourceApi.createResource -POST /v1/resources/{resourceId} PollenResourceApi.editResource -DELETE /v1/resources/{resourceId} PollenResourceApi.deleteResource - -GET /v1/resources/{resourceId}/meta/{n} forward:/v1/resources/{resourceId}/meta -GET /v1/resources/{resourceId}/preview/{n} forward:/v1/resources/{resourceId}/preview -GET /v1/resources/{resourceId}/{n} forward:/v1/resources/{resourceId} - -# PollenUserApi - -GET /v1/users PollenUserApi.getUsers -GET /v1/users/connected PollenUserApi.getConnectedUser -GET /v1/users/{userId} PollenUserApi.getUser -POST /v1/users PollenUserApi.createUser -POST /v1/users/{userId} PollenUserApi.editUser -PUT,POST /v1/users/{userId}/password PollenUserApi.changePassword -POST /v1/users/{userId}/admin PollenUserApi.adminUser -DELETE /v1/users/{userId} PollenUserApi.deleteUser -DELETE /v1/users/{userId}/ban PollenUserApi.banUser -POST /v1/users/{userId}/makeAdmin PollenUserApi.makeAdmin -POST /v1/users/{userId}/unmakeAdmin PollenUserApi.unmakeAdmin -PUT /v1/users/{userId}?token={} PollenUserApi.validateUserEmail - -# VoteCountingApi - -GET /v1/polls/{pollId}/results VoteCountingApi.getMainResult -GET /v1/polls/{pollId}/groupResults VoteCountingApi.getGroupResult - -# VoteCountingTypeApi - -GET /v1/voteCountingTypes VoteCountingTypeApi.getVoteCountingTypes -GET /v1/voteCountingTypes/{id} VoteCountingTypeApi.getVoteCountingType - -# VoterListApi - -# PUT /v1/polls/{pollId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteListNewGroup -# PUT /v1/polls/{pollId}/voterLists/{voterListId}/favoriteLists/{favoriteListId} VoterListApi.importFavoriteList -GET /v1/polls/{pollId}/mainVoterList VoterListApi.getMainVoterList -GET /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.getVoterList -GET /v1/polls/{pollId}/voterLists/{voterListId}/resend VoterListApi.resendInvitationVoterList -POST /v1/polls/{pollId}/voterLists VoterListApi.createVoterList -POST /v1/polls/{pollId}/voterLists/save VoterListApi.saveVoters -PUT,POST /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.editVoterList -DELETE /v1/polls/{pollId}/voterLists/{voterListId} VoterListApi.deleteVoterList - -GET /v1/polls/{pollId}/voterLists/{voterListId}/lists VoterListApi.getVoterLists - -GET /v1/polls/{pollId}/voterLists/{voterListId}/members VoterListApi.getMembers -GET /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.getMember -GET /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId}/resend VoterListApi.resendInvitationMember -POST /v1/polls/{pollId}/voterLists/{voterListId}/members VoterListApi.addMember -PUT,POST /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.editMember -DELETE /v1/polls/{pollId}/voterLists/{voterListId}/members/{memberId} VoterListApi.deleteMember - -# VoteApi - -GET /v1/polls/{pollId}/votes VoteApi.getVotes -GET /v1/polls/{pollId}/votes/new VoteApi.getNewVote -GET /v1/polls/{pollId}/votes/{voteId} VoteApi.editVote -POST /v1/polls/{pollId}/votes VoteApi.addVote -GET /v1/polls/{pollId}/votes/{voteId} VoteApi.getVote -PUT,POST /v1/polls/{pollId}/votes/{voteId} VoteApi.editVote -DELETE /v1/polls/{pollId}/votes/{voteId} VoteApi.deleteVote -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm