This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit db19e95fa3b43d0ebac49644731a028bdd958aa7 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 26 17:40:53 2014 +0200 move default pollen-rest-api properties --- pollen-rest-api/src/main/resources/pollen-rest-api.properties | 7 +------ .../chorem/pollen/services/config/PollenServiceConfigOption.java | 8 ++++---- pollen-services/src/test/resources/pollen-services.properties | 6 +----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pollen-rest-api/src/main/resources/pollen-rest-api.properties b/pollen-rest-api/src/main/resources/pollen-rest-api.properties index 4a49dbc..eb2a93c 100644 --- a/pollen-rest-api/src/main/resources/pollen-rest-api.properties +++ b/pollen-rest-api/src/main/resources/pollen-rest-api.properties @@ -25,9 +25,4 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver hibernate.hbm2ddl.auto=update pollen.version=${project.version} -pollen.ui.host=http://localhost -pollen.ui.url.poll.edit=${pollen.ui.host}/#/poll/edit/{pollId}/{pollToken} -pollen.ui.url.poll.vote=${pollen.ui.host}/#/poll/vote/{pollId}/{pollToken} -pollen.ui.url.poll.vote.edit=${pollen.ui.url.poll.vote}/vote/{voteToken} -#pollen.ui.url.user.forgotPassword=${pollen.ui.host}/#/user/{userId}/{token} -pollen.ui.url.user.validate=${pollen.ui.host}/#/user/{userId}/{token} \ No newline at end of file +pollen.ui.host=http://localhost \ No newline at end of file diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java index f768934..2517572 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java @@ -227,22 +227,22 @@ public enum PollenServiceConfigOption implements ConfigOptionDef { URL_POLL_EDIT( "pollen.ui.url.poll.edit", "Url d'édition de sondage", - null, + "${pollen.ui.host}/#/poll/edit/{pollId}/{pollToken}", String.class), URL_POLL_VOTE( "pollen.ui.url.poll.vote", "Url de vote", - null, + "${pollen.ui.host}/#/poll/vote/{pollId}/{pollToken}", String.class), URL_POLL_VOTE_EDIT( "pollen.ui.url.poll.vote.edit", "Url d'edition vote", - null, + "${pollen.ui.url.poll.vote}/vote/{voteToken}", String.class), URL_USER_VALIDATE( "pollen.ui.url.user.validate", "Url de validation d'utilisateur", - null, + "${pollen.ui.host}/#/user/{userId}/{token}", String.class),; protected final String key; diff --git a/pollen-services/src/test/resources/pollen-services.properties b/pollen-services/src/test/resources/pollen-services.properties index 6235b0c..e86489f 100644 --- a/pollen-services/src/test/resources/pollen-services.properties +++ b/pollen-services/src/test/resources/pollen-services.properties @@ -25,8 +25,4 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver hibernate.hbm2ddl.auto=update pollen.version=${project.version} -pollen.ui.host=http://localhost -pollen.ui.url.poll.edit=${pollen.ui.host}/#/poll/edit/{pollId}/{pollToken} -pollen.ui.url.poll.vote=${pollen.ui.host}/#/poll/vote/{pollId}/{pollToken} -pollen.ui.url.poll.vote.edit=${pollen.ui.url.poll.vote}/vote/{voteToken} -pollen.ui.url.user.validate=${pollen.ui.host}/#/user/{userId}/{token} \ No newline at end of file +pollen.ui.host=http://localhost \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.