Pollen-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- 3196 discussions
This is an automated email from the git hooks/post-receive script.
New commit to branch devel in repository pollen.
See http://git.chorem.org/pollen.git
commit 052eee3d4ffd23351868b0381160f8dca9742b9f
Author: Adrien Garandel <a.garandel(a)dralagen.fr>
Date: Mon Jun 2 14:06:20 2014 +0200
add menu for change locale
---
pollen-ui-angular/src/main/webapp/img/en.png | Bin 0 -> 599 bytes
pollen-ui-angular/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes
pollen-ui-angular/src/main/webapp/index.html | 18 +++++++++---
pollen-ui-angular/src/main/webapp/js/app.js | 2 +-
.../src/main/webapp/js/controllers/localeCtrl.js | 32 +++++++++++++++++++++
5 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/pollen-ui-angular/src/main/webapp/img/en.png b/pollen-ui-angular/src/main/webapp/img/en.png
new file mode 100644
index 0000000..ff701e1
Binary files /dev/null and b/pollen-ui-angular/src/main/webapp/img/en.png differ
diff --git a/pollen-ui-angular/src/main/webapp/img/fr.png b/pollen-ui-angular/src/main/webapp/img/fr.png
new file mode 100644
index 0000000..8332c4e
Binary files /dev/null and b/pollen-ui-angular/src/main/webapp/img/fr.png differ
diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html
index 3a6f668..258f372 100644
--- a/pollen-ui-angular/src/main/webapp/index.html
+++ b/pollen-ui-angular/src/main/webapp/index.html
@@ -29,10 +29,10 @@
<script src="js/conf.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.min.js"></script>
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular.min.js"></script>
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-route.min.js"></script>
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-resource.min…"></script>
- <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-cookies.min.…"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.min.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-resource.min…"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-cookies.min.…"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.11.0/ui-bootst…"></script>
<script src="js/libs/ckeditor/ckeditor.js"></script>
@@ -40,6 +40,7 @@
<script src="js/services.js"></script>
<script src="js/controllers/pollCtrl.js"></script>
<script src="js/controllers/userCtrl.js"></script>
+ <script src="js/controllers/localeCtrl.js"></script>
</head>
<body>
@@ -48,6 +49,15 @@
<div class="navbar-header">
<a class="navbar-brand" href="#">Pollen</a>
</div>
+ <ul class="nav navbar-nav pull-right" ng-controller="LocaleCtrl">
+ <li dropdown class="dropdown-toggle">
+ <a> <img src="img/{{locale}}.png" /></a>
+ <ul class="dropdown-menu">
+ <li><a ng-click="switchLocale('fr')"><img src="img/fr.png" /> Français </a></li>
+ <li><a ng-click="switchLocale('en')"><img src="img/en.png" /> English </a> </li>
+ </ul>
+ </li>
+ </ul>
<div class="collapse navbar-collapse" ng-controller="UserLoginCtrl">
<ul class="nav navbar-nav">
<li><a href="#/poll/create">Creer</a></li>
diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js
index e310b8f..d25969c 100644
--- a/pollen-ui-angular/src/main/webapp/js/app.js
+++ b/pollen-ui-angular/src/main/webapp/js/app.js
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
-angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'ui.bootstrap', 'ngCookies'])
+angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'localeControllers', 'ui.bootstrap', 'ngCookies'])
.config(['$httpProvider', function($httpProvider) {
// edit header for locale and sessionToken
$httpProvider.interceptors.push('httpInterceptor');
diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js
new file mode 100644
index 0000000..fe18e24
--- /dev/null
+++ b/pollen-ui-angular/src/main/webapp/js/controllers/localeCtrl.js
@@ -0,0 +1,32 @@
+/*
+ * #%L
+ * Pollen :: UI (Angular)
+ * %%
+ * 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%
+ */
+angular.module('localeControllers', [])
+.controller('LocaleCtrl', ['$scope', 'SessionStorage',function ($scope, SessionStorage) {
+ $scope.locale = SessionStorage.get().locale;
+
+ $scope.switchLocale = function (locale) {
+ //change locale
+ if (locale != $scope.locale) {
+ SessionStorage.save({locale:locale});
+ $scope.locale = locale;
+ }
+ }
+}])
--
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
This is an automated email from the git hooks/post-receive script.
New commit to branch devel in repository pollen.
See http://git.chorem.org/pollen.git
commit 09155938fa9ba73d15542c4b1500bdbc13aa9506
Author: Adrien Garandel <a.garandel(a)dralagen.fr>
Date: Mon Jun 2 14:05:11 2014 +0200
translate choice error
---
.../java/org/chorem/pollen/services/service/ChoiceService.java | 8 +++++---
.../src/main/resources/i18n/pollen-services_en_GB.properties | 3 +++
.../src/main/resources/i18n/pollen-services_fr_FR.properties | 3 +++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java
index 2514e88..3e6acc0 100644
--- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java
+++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java
@@ -37,6 +37,8 @@ import org.chorem.pollen.services.service.security.PermissionVerb;
import java.util.List;
import java.util.Set;
+import static org.nuiton.i18n.I18n.l;
+
/**
* TODO
*
@@ -259,7 +261,7 @@ public class ChoiceService extends PollenServiceSupport {
Set<String> choiceNames = Sets.newHashSet();
- boolean withChoiceType = checkNotNull(errors, "choiceType", choice.getChoiceType(), "choiceType can not be null");
+ boolean withChoiceType = checkNotNull(errors, "choiceType", choice.getChoiceType(), l(getLocale(), "pollen.error.choice.choiceTypeEmpty"));
if (CollectionUtils.isNotEmpty(existingChoices)) {
@@ -289,11 +291,11 @@ public class ChoiceService extends PollenServiceSupport {
boolean nameNotBlank = checkNotBlank(errors,
"name",
choiceName,
- "choice name can not be empty");
+ l(getLocale(), "pollen.error.choice.choiceNameEmpty"));
if (nameNotBlank) {
boolean nameAdded = choiceNames.add(choiceName);
- check(errors, "name", nameAdded, "choice name already used in this list");
+ check(errors, "name", nameAdded, l(getLocale(), "pollen.error.choice.choiceNameExist"));
}
break;
diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties
index aba2f45..3eab430 100644
--- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties
+++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties
@@ -11,6 +11,9 @@ pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used
pollen.configuration.defaultPollenUserPageSize=
pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll
pollen.configuration.sessionTimeoutDelay=Inactivity delay before invalidate the session of a user (in seconds)
+pollen.error.choice.choiceNameEmpty=choice name can not be empty
+pollen.error.choice.choiceNameExist=choice name already used in this list
+pollen.error.choice.choiceTypeEmpty=choiceType can not be null
pollen.error.favoriteList.import.csv.already.used.email=
pollen.error.favoriteList.import.csv.already.used.name=
pollen.error.favoriteList.import.csv.invalid.email=
diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties
index 2bc5315..1faec5d 100644
--- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties
+++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties
@@ -11,6 +11,9 @@ pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut
pollen.configuration.defaultPollenUserPageSize=
pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage
pollen.configuration.sessionTimeoutDelay=Temps autorisé d'inactivité avant d'invalider une session utilisateur (en secondes)
+pollen.error.choice.choiceNameEmpty=le nom du choix ne peut pas être vide
+pollen.error.choice.choiceNameExist=le nom du choix est déjà utilisé sur ce sondage
+pollen.error.choice.choiceTypeEmpty=le type du choix doit être défini
pollen.error.favoriteList.import.csv.already.used.email=
pollen.error.favoriteList.import.csv.already.used.name=
pollen.error.favoriteList.import.csv.invalid.email=
--
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
This is an automated email from the git hooks/post-receive script.
New commit to branch devel in repository pollen.
See http://git.chorem.org/pollen.git
commit 96ba3bf40b762cfa11bdeb920ce42598317d7343
Author: Adrien Garandel <a.garandel(a)dralagen.fr>
Date: Mon Jun 2 12:01:01 2014 +0200
add translate (fr-en) in pollUserService
---
.../chorem/pollen/services/service/PollenUserService.java | 14 ++++++++------
.../main/resources/i18n/pollen-services_en_GB.properties | 5 +++++
.../main/resources/i18n/pollen-services_fr_FR.properties | 5 +++++
.../src/main/webapp/partials/user-register.html | 4 ++++
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java
index e7e3417..4191c45 100644
--- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java
+++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java
@@ -40,6 +40,8 @@ import org.nuiton.util.pagination.PaginationResult;
import java.util.Objects;
+import static org.nuiton.i18n.I18n.l;
+
/**
* TODO
*
@@ -204,11 +206,11 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer
String userEmail = getCleanMail(user.getEmail());
- boolean emailNotblank = checkNotBlank(errors, "email", userEmail, "email can not be empty");
+ boolean emailNotblank = checkNotBlank(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailEmpty"));
if (emailNotblank) {
- checkValidEmail(errors, "email", userEmail, "email is not valid");
+ checkValidEmail(errors, "email", userEmail, l(getLocale(), "pollen.error.user.mailInvalid"));
if (userExists) {
@@ -218,19 +220,19 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer
if (emailChanged) {
- check(errors, "email", !dao.emailExists(userEmail), "email already exists");
+ check(errors, "email", !dao.emailExists(userEmail), l(getLocale(), "pollen.error.user.mailExist"));
}
} else {
- check(errors, "email", !dao.emailExists(userEmail), "email already exists");
+ check(errors, "email", !dao.emailExists(userEmail), l(getLocale(), "pollen.error.user.mailExist"));
}
}
- boolean passwordNotBlank = checkNotBlank(errors, "password", user.getPassword() , "password can not be empty");
+ boolean passwordNotBlank = checkNotBlank(errors, "password", user.getPassword() , l(getLocale(), "pollen.error.user.passwordEmpty"));
if (userExists && passwordNotBlank) {
@@ -242,7 +244,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer
} catch (PollenInvalidPasswordException e) {
- check(errors, "password", false, "invalid password");
+ check(errors, "password", false, l(getLocale(), "pollen.error.user.passwordInvalid"));
}
diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties
index 13c2595..aba2f45 100644
--- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties
+++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties
@@ -28,6 +28,11 @@ pollen.error.poll.voteCountingType.mandatory=vote counting type is mandatory
pollen.error.poll.voteVisibility.mandatory=vote visibility is mandatory
pollen.error.poll.voterList.mandatory.for.groupedPoll=At least one voter list ins mandatory for a grouped poll
pollen.error.poll.voterList.mismatch.freePoll=
+pollen.error.user.mailEmpty=email can not be empty
+pollen.error.user.mailExist=email already exists
+pollen.error.user.mailInvalid=email is not valid
+pollen.error.user.passwordEmpty=password can not be empty
+pollen.error.user.passwordInvalid=password is not valid
pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] A choice was added in poll %s
pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] A choice was deleted in poll %s
pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] A choice was edited in poll %s
diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties
index 572583b..2bc5315 100644
--- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties
+++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties
@@ -27,6 +27,11 @@ pollen.error.poll.voteCountingType.mandatory=le type de vote est obligatoire
pollen.error.poll.voteVisibility.mandatory=la visiblité des votes est obligatoire
pollen.error.poll.voterList.mandatory.for.groupedPoll=Au moins une liste de votant est obligatoire pour un sondage groupé
pollen.error.poll.voterList.mismatch.freePoll=Liste de votants impossible pour un sondage libre
+pollen.error.user.mailEmpty=Courriel ne peut pas être vide
+pollen.error.user.mailExist=Courriel existe déjà
+pollen.error.user.mailInvalid=Courriel est invalide
+pollen.error.user.passwordEmpty=Mot de passe ne peut pas être vide
+pollen.error.user.passwordInvalid=Mot de passe est invalide
pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] Un choix a été ajouté au sondage %s
pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] Un choix a été supprimé du sondage %s
pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] Un choix a été modifié sur le sondage %s
diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html
index 3109875..819a4e5 100644
--- a/pollen-ui-angular/src/main/webapp/partials/user-register.html
+++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html
@@ -62,6 +62,10 @@
<div class="col-sm-6">
<input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/>
</div>
+ <div class="col-sm-1">
+ <info-error error="restError.password[0]" data="data.user.password"></info-error>
+
+ </div>
</div>
<div class="control-group">
<label for="formPassword2" class="col-sm-5 text-right control-label">
--
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
This is an automated email from the git hooks/post-receive script.
New commit to branch devel in repository pollen.
See http://git.chorem.org/pollen.git
commit da31e2855a7bb26e315dfc6f18ded4bb63f468c2
Author: Adrien Garandel <a.garandel(a)dralagen.fr>
Date: Mon Jun 2 11:18:33 2014 +0200
Add form lostPassword
---
pollen-rest-api/src/main/resources/mapping | 2 +-
pollen-ui-angular/src/main/webapp/index.html | 2 +-
pollen-ui-angular/src/main/webapp/js/app.js | 1 +
.../src/main/webapp/js/controllers/userCtrl.js | 21 +++++
pollen-ui-angular/src/main/webapp/js/services.js | 8 ++
.../src/main/webapp/partials/user-login.html | 2 +
.../main/webapp/partials/user-lostPassword.html | 47 ++++++++++
.../src/main/webapp/partials/user-register.html | 104 +++++++++++----------
8 files changed, 134 insertions(+), 53 deletions(-)
diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping
index fe48ec3..06799d9 100644
--- a/pollen-rest-api/src/main/resources/mapping
+++ b/pollen-rest-api/src/main/resources/mapping
@@ -53,7 +53,7 @@ GET /v1/doc DocApi.showMapping
# AuthApi
POST,PUT /v1/login AuthApi.login
-GET /v1/lostpassword/{token} AuthApi.lostPassword
+GET /v1/lostpassword/{login} AuthApi.lostPassword
GET /v1/logout AuthApi.logout
# ChoiceApi
diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html
index 173af00..3a6f668 100644
--- a/pollen-ui-angular/src/main/webapp/index.html
+++ b/pollen-ui-angular/src/main/webapp/index.html
@@ -83,7 +83,7 @@
<li class="dropdown" ng-show="currentUser.id">
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
- {{ currentUser.name || currentUser.login }} <strong class="caret"></strong>
+ {{ currentUser.name || currentUser.email }} <strong class="caret"></strong>
</a>
<ul class="dropdown-menu" role="menu">
diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js
index 1a252fa..e310b8f 100644
--- a/pollen-ui-angular/src/main/webapp/js/app.js
+++ b/pollen-ui-angular/src/main/webapp/js/app.js
@@ -69,6 +69,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC
.when('/poll/list/:cmd', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"})
.when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"})
.when('/user/edit', {templateUrl: './partials/user-edit.html', controller:"UserEditCtrl"})
+ .when('/user/lostpassword', {templateUrl: './partials/user-lostPassword.html', controller:"UserLostPasswordCtrl"})
.otherwise({redirectTo: '/'});
}])
diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js
index 218f6df..e4c8070 100644
--- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js
+++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js
@@ -29,6 +29,8 @@
$scope.submit = function () {
if ($scope.data.user.password == $scope.data.user.password2) {
User.add({}, $scope.data.user, function (data) {
+ $scope.saved = true;
+ $scope.data.user = {email:'', password:'', password2:''};
}, function (error) {
$scope.restError = error.data;
});
@@ -36,6 +38,25 @@
}
}])
+.controller('UserLostPasswordCtrl', ['$scope', 'UserLostPassword', function ($scope, UserLostPassword) {
+ $scope.email = '';
+ $scope.submit = function () {
+ if ($scope.email != '') {
+ UserLostPassword.send({login:$scope.email}, function (data) {
+ $scope.saved = true;
+ $scope.email = '';
+ }, function (error) {
+ $scope.restError = {email: ["email n'a pas été trouvé"]};
+ })
+ }
+ else {
+ $scope.restError = {email : ["email ne peut pas être vide"]};
+ }
+ }
+}])
+
+
+
.controller('UserEditCtrl', ['$scope', 'User', 'SessionStorage', function ($scope, User, SessionStorage) {
$scope.currentUser = SessionStorage.get().user;
$scope.currentUser.password = '';
diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js
index 8171f52..20679cf 100644
--- a/pollen-ui-angular/src/main/webapp/js/services.js
+++ b/pollen-ui-angular/src/main/webapp/js/services.js
@@ -168,6 +168,14 @@ angular.module('pollenServices', ['ngResource'])
})
}])
+.factory('UserLostPassword', ['$resource', function ($resource) {
+ return $resource(conf.restURL+'/lostpassword/:login', {},
+ {
+ 'send' : {
+ method: 'GET'
+ }
+ })
+}])
.factory('SessionStorage', [function () {
var storageId='sessionStorage';
diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html
index 5d8f8e4..9a6cf79 100644
--- a/pollen-ui-angular/src/main/webapp/partials/user-login.html
+++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html
@@ -22,6 +22,8 @@
<div class="form-actions">
<button type="submit" class="btn btn-primary">Connexion</button>
+ <hr/>
+ <a href="#/user/lostpassword">Mot de passe oublié</a>
</div>
</form>
\ No newline at end of file
diff --git a/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html
new file mode 100644
index 0000000..1108f58
--- /dev/null
+++ b/pollen-ui-angular/src/main/webapp/partials/user-lostPassword.html
@@ -0,0 +1,47 @@
+<!--
+ #%L
+ Pollen :: UI (Angular)
+ %%
+ 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%
+ -->
+<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Compte enregisté, un mail de validation vient d'être envoyé..</alert>
+
+<h2>Mot de passe oublié</h2>
+<form ng-submit="submit()" class="form-horizontal">
+
+ <div class="control-group">
+
+ <label for="formEmail" class="col-sm-5 text-right control-label">
+ Courriel
+ </label>
+
+ <div class="col-sm-6">
+ <input type="email" id="formEmail" name="email" class="form-control" ng-model="email"/>
+ </div>
+ <div class="col-sm-1">
+ <info-error error="restError.email[0]" data="email"></info-error>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <div class="col-sm-5"></div>
+ <div class="col-sm-6">
+ <button class="btn btn-primary" type="submit">Récupéré</button>
+ </div>
+ <div class="col-sm-1"></div>
+ </div>
+</form>
\ No newline at end of file
diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html
index 6ae1a8f..3109875 100644
--- a/pollen-ui-angular/src/main/webapp/partials/user-register.html
+++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html
@@ -18,66 +18,68 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
#L%
-->
- <h2>Créer un compte</h2>
- <form ng-submit="submit()" class="form-horizontal">
+<alert type="success" class="alert-float" ng-show="saved" close="saved = false"> Compte enregisté, un mail de validation vient d'être envoyé..</alert>
- <div class="control-group">
+<h2>Créer un compte</h2>
+<form ng-submit="submit()" class="form-horizontal">
- <label for="formEmail" class="col-sm-5 text-right control-label">
- Courriel
- </label>
+ <div class="control-group">
- <div class="col-sm-6">
- <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/>
- </div>
- <div class="col-sm-1">
- <info-error error="restError.email[0]" data="data.user.email"></info-error>
- </div>
- </div>
+ <label for="formEmail" class="col-sm-5 text-right control-label">
+ Courriel
+ </label>
- <div class="control-group">
- <label for="formName" class="col-sm-5 text-right control-label">
- Nom
- </label>
- <div class="col-sm-6">
- <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/>
- </div>
- <div class="col-sm-1">
- </div>
- </div>
+ <div class="col-sm-6">
+ <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/>
+ </div>
+ <div class="col-sm-1">
+ <info-error error="restError.email[0]" data="data.user.email"></info-error>
+ </div>
+ </div>
+ <div class="control-group">
+ <label for="formName" class="col-sm-5 text-right control-label">
+ Nom
+ </label>
+ <div class="col-sm-6">
+ <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/>
+ </div>
+ <div class="col-sm-1">
+ </div>
+ </div>
- <div>
- <div class="col-sm-3"></div>
- <div class="col-sm-8"><hr/></div>
- <div class="col-sm-1"></div>
- </div>
- <div class="control-group">
- <label for="formPassword" class="col-sm-5 text-right control-label">
- Mot de passe
- </label>
- <div class="col-sm-6">
- <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/>
- </div>
+ <div>
+ <div class="col-sm-3"></div>
+ <div class="col-sm-8"><hr/></div>
+ <div class="col-sm-1"></div>
</div>
+
<div class="control-group">
- <label for="formPassword2" class="col-sm-5 text-right control-label">
- Confirmation
- </label>
- <div class="col-sm-6">
- <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/>
- </div>
- <div class="col-sm-1">
- <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span>
- </div>
+ <label for="formPassword" class="col-sm-5 text-right control-label">
+ Mot de passe
+ </label>
+ <div class="col-sm-6">
+ <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label for="formPassword2" class="col-sm-5 text-right control-label">
+ Confirmation
+ </label>
+ <div class="col-sm-6">
+ <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/>
</div>
+ <div class="col-sm-1">
+ <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span>
+ </div>
+ </div>
- <div class="control-group">
- <div class="col-sm-5"></div>
- <div class="col-sm-6">
- <button class="btn btn-primary" type="submit">S'enregister</button>
- </div>
- <div class="col-sm-1"></div>
+ <div class="control-group">
+ <div class="col-sm-5"></div>
+ <div class="col-sm-6">
+ <button class="btn btn-primary" type="submit">S'enregister</button>
</div>
- </form>
\ No newline at end of file
+ <div class="col-sm-1"></div>
+ </div>
+</form>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
This is an automated email from the git hooks/post-receive script.
New commit to branch devel in repository pollen.
See http://git.chorem.org/pollen.git
commit 96f88faba8168b71969293a8db28d131a77cc82b
Author: Tony CHEMIT <chemit(a)codelutin.com>
Date: Fri May 30 12:01:25 2014 +0200
tidy pom
---
pollen-rest-api/pom.xml | 24 +++++++++++-------------
pollen-services/pom.xml | 1 -
pollen-ui-angular/pom.xml | 7 +++----
pollen-votecounting-aggregator/pom.xml | 5 +----
pollen-votecounting-api/pom.xml | 1 -
pollen-votecounting-borda/pom.xml | 2 +-
pollen-votecounting-condorcet/pom.xml | 2 +-
pollen-votecounting-coombs/pom.xml | 2 +-
pollen-votecounting-instant-runoff/pom.xml | 2 +-
pollen-votecounting-normal/pom.xml | 2 +-
pollen-votecounting-number/pom.xml | 2 +-
pollen-votecounting-percentage/pom.xml | 2 +-
12 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml
index db0e731..af88551 100644
--- a/pollen-rest-api/pom.xml
+++ b/pollen-rest-api/pom.xml
@@ -17,6 +17,17 @@
<name>Pollen :: Rest Api</name>
<description>Pollen Rest Api</description>
+ <properties>
+
+ <i18n.silent>true</i18n.silent>
+ <i18n.bundleOutputName>${pollenI18nBundle}</i18n.bundleOutputName>
+
+ <defaultWebContextPath>pollen-rest-api</defaultWebContextPath>
+ <defaultLogDir>${basedir}/target</defaultLogDir>
+ <defaultDbDir>${basedir}/target</defaultDbDir>
+
+ </properties>
+
<dependencies>
<dependency>
@@ -186,16 +197,6 @@
</dependencies>
- <properties>
-
- <i18n.silent>true</i18n.silent>
- <i18n.bundleOutputName>${pollenI18nBundle}</i18n.bundleOutputName>
-
- <defaultWebContextPath>pollen-rest-api</defaultWebContextPath>
- <defaultLogDir>${basedir}/target</defaultLogDir>
- <defaultDbDir>${basedir}/target</defaultDbDir>
-
- </properties>
<build>
<resources>
<resource>
@@ -207,7 +208,6 @@
<filtering>true</filtering>
</resource>
</resources>
-
<pluginManagement>
<plugins>
<plugin>
@@ -247,7 +247,6 @@
</plugin>
</plugins>
</pluginManagement>
-
<plugins>
<plugin>
<groupId>org.nuiton.i18n</groupId>
@@ -274,5 +273,4 @@
</profile>
</profiles>
-
</project>
diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml
index 19c8c13..71345de 100644
--- a/pollen-services/pom.xml
+++ b/pollen-services/pom.xml
@@ -151,7 +151,6 @@
</dependencies>
<build>
-
<testResources>
<testResource>
<directory>src/test/resources</directory>
diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml
index bd8ec74..b0b6b99 100644
--- a/pollen-ui-angular/pom.xml
+++ b/pollen-ui-angular/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -9,13 +8,13 @@
<version>2.0-SNAPSHOT</version>
</parent>
- <name>Pollen :: UI (Angular) </name>
- <description>Pollen UI</description>
-
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-ui-angular</artifactId>
<packaging>war</packaging>
+ <name>Pollen :: UI (Angular) </name>
+ <description>Pollen UI</description>
+
<properties>
<!-- Post Release configuration -->
diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml
index 6c17991..5012b50 100644
--- a/pollen-votecounting-aggregator/pom.xml
+++ b/pollen-votecounting-aggregator/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,14 +10,13 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-aggregator</artifactId>
+ <packaging>pom</packaging>
<name>Pollen :: VoteCounting (Aggregator)</name>
<description>
Aggregator of all implementations of votecounting offers by Pollen
</description>
- <packaging>pom</packaging>
-
<modules>
<module>../pollen-votecounting-normal</module>
<module>../pollen-votecounting-percentage</module>
@@ -68,4 +66,3 @@
</dependencies>
</project>
-
diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml
index c682053..dfbb715 100644
--- a/pollen-votecounting-api/pom.xml
+++ b/pollen-votecounting-api/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml
index 3cc35b7..fba3fd7 100644
--- a/pollen-votecounting-borda/pom.xml
+++ b/pollen-votecounting-borda/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,6 +10,7 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-borda</artifactId>
+
<name>Pollen :: VoteCounting :: Borda</name>
<description>Implements the borda vote counting</description>
diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml
index bb17a6f..345fe66 100644
--- a/pollen-votecounting-condorcet/pom.xml
+++ b/pollen-votecounting-condorcet/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,6 +10,7 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-condorcet</artifactId>
+
<name>Pollen :: VoteCounting :: Condorcet</name>
<description>Implements the condorcet vote counting</description>
diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml
index b96114d..eb73702 100644
--- a/pollen-votecounting-coombs/pom.xml
+++ b/pollen-votecounting-coombs/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,6 +10,7 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-coombs</artifactId>
+
<name>Pollen :: VoteCounting :: Coombs</name>
<description>Implements the coombs vote counting</description>
diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml
index 7baf7b2..aaa023b 100644
--- a/pollen-votecounting-instant-runoff/pom.xml
+++ b/pollen-votecounting-instant-runoff/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,6 +10,7 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-instant-runoff</artifactId>
+
<name>Pollen :: VoteCounting :: Instant Runoff</name>
<description>Implements the instant-runoff vote counting</description>
diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml
index 73b6ee6..f60484d 100644
--- a/pollen-votecounting-normal/pom.xml
+++ b/pollen-votecounting-normal/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,6 +10,7 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-normal</artifactId>
+
<name>Pollen :: VoteCounting :: Normal</name>
<description>Implements the normal vote counting</description>
diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml
index b1a5751..c734203 100644
--- a/pollen-votecounting-number/pom.xml
+++ b/pollen-votecounting-number/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,6 +10,7 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-number</artifactId>
+
<name>Pollen :: VoteCounting :: Number</name>
<description>Implements the number vote counting</description>
diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml
index 7ad23d0..2db0b26 100644
--- a/pollen-votecounting-percentage/pom.xml
+++ b/pollen-votecounting-percentage/pom.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -11,6 +10,7 @@
<groupId>org.chorem.pollen</groupId>
<artifactId>pollen-votecounting-percentage</artifactId>
+
<name>Pollen :: VoteCounting :: Percentage</name>
<description>Implements the percentage vote counting</description>
--
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
30 May '14
See <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/2/>
------------------------------------------
Started by an SCM change
Building in workspace <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/ws/>
Fetching changes from the remote Git repository
Fetching upstream changes from https://git.chorem.org/pollen.git
FATAL: Failed to fetch from https://git.chorem.org/pollen.git
hudson.plugins.git.GitException: Failed to fetch from https://git.chorem.org/pollen.git
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:623)
at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:855)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:880)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1251)
at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:605)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88)
at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:514)
at hudson.model.Run.execute(Run.java:1703)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:525)
at hudson.model.ResourceController.execute(ResourceController.java:88)
at hudson.model.Executor.run(Executor.java:231)
Caused by: hudson.plugins.git.GitException: Command "git fetch --tags --progress https://git.chorem.org/pollen.git +refs/heads/*:refs/remotes/origin/*" returned status code 128:
stdout:
stderr: error: RPC failed; result=22, HTTP code = 401
fatal: The remote end hung up unexpectedly
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1276)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1146)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$200(CliGitAPIImpl.java:87)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:254)
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:621)
... 10 more
1
13
Build failed in Jenkins: pollen-rest-api-nightly » Pollen :: Persistence #13
by admin+ci-chorem.org@codelutin.com 30 May '14
by admin+ci-chorem.org@codelutin.com 30 May '14
30 May '14
See <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Pollen :: Persistence 2.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 42.2 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 1.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (8 KB at 345.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (8 KB at 330.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (1017 B at 47.3 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (1017 B at 3.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (14 KB at 614.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (66 KB at 1877.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 45.5 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (2 KB at 2.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (4 KB at 157.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (4 KB at 150.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (806 B at 35.8 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (806 B at 2.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (15 KB at 570.3 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/nuiton…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui… (2 KB at 60.2 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/nuiton… (2 KB at 4.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/slf…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/slf4j/slf4j-j…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/slf4j/slf4j-j… (2 KB at 37.2 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7… (2 KB at 1.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (205 KB at 3188.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/slf…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/slf4j/slf4j-j…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/slf4j/slf4j-j… (7 KB at 187.1 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-jcl/1.7.7/slf4j-jcl-1.7… (7 KB at 58.7 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ pollen-persistence ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ pollen-persistence ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ pollen-persistence ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ pollen-persistence ---
[INFO] Exporting server [redmine-forge.chorem.org] privateKey in ${redmine.apiKey}
[INFO]
[INFO] --- eugene-maven-plugin:2.10-SNAPSHOT:generate (generate-entities) @ pollen-persistence ---
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 51.3 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (2 KB at 4.3 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (5 KB at 207.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/topia/… (5 KB at 207.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 55.6 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 4.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (7 KB at 286.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (7 KB at 286.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 38.1 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 4.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (4 KB at 188.3 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (4 KB at 179.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 56.5 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 4.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 75.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 75.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 51.4 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (2 KB at 4.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (3 KB at 39.0 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/nuiton/eugene… (3 KB at 87.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (9 KB at 289.7 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (10 KB at 326.6 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (28 KB at 688.5 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (270 KB at 4346.4 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (97 KB at 1477.8 KB/sec)
[INFO] Process phase [zargo]
[INFO] Generate one file in 12.246ms.
[INFO] Process phase [xmi]
[INFO] Generate one file in 744.165ms.
[INFO] Process phase [model]
[INFO] Process phase [generator]
[INFO] Apply generator JavaEnumerationTransformer
[INFO] Apply generator TopiaMetaTransformer
[INFO] Generate 92 files in 241.154ms.
[INFO]
[INFO] --- license-maven-plugin:1.7:update-project-license (attach-licenses) @ pollen-persistence ---
[INFO]
[INFO] --- license-maven-plugin:1.7:add-third-party (attach-licenses) @ pollen-persistence ---
[INFO] Load missing file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO] Missing file <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…> is up-to-date.
[INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO] Will attach third party file from <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ pollen-persistence ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO] Copying 13 resources
[INFO] Copying 2 resources
[INFO]
[INFO] --- license-maven-plugin:1.7:update-file-header (update-file-header) @ pollen-persistence ---
[INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO] Will search files to update from root <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO] Scan 113 files header done in 86.497ms.
[INFO]
* uptodate header on 21 files.
* add header on 92 files.
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ pollen-persistence ---
[INFO] Compiling 95 source files to <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>: Recompile with -Xlint:unchecked for details.
[INFO]
[INFO] --- animal-sniffer-maven-plugin:1.10:check (default) @ pollen-persistence ---
[INFO] Checking unresolved references to org.codehaus.mojo.signature:java17:1.0
[INFO]
[INFO] --- jredmine-maven-plugin:1.8.2:generate-changes (jredmine-generate-changes) @ pollen-persistence ---
[INFO] Skipping goal (skipGenerateChanges flag is on).
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ pollen-persistence ---
[INFO] Executing tasks
main:
[mkdir] Created dir: <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO] Executed tasks
[INFO]
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ pollen-persistence ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ pollen-persistence ---
[INFO] No sources to compile
[INFO]
[INFO] --- maven-surefire-plugin:2.17:test (default-test) @ pollen-persistence ---
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ pollen-persistence ---
[INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO]
[INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence >>>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ pollen-persistence ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ pollen-persistence ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ pollen-persistence ---
[INFO] Skipping goal (runOnce flag is on and goal was already executed).
[INFO]
[INFO] --- eugene-maven-plugin:2.10-SNAPSHOT:generate (generate-entities) @ pollen-persistence ---
[INFO] Process phase [zargo]
[INFO] No file generated.
[INFO] Process phase [xmi]
[INFO] Generate one file in 202.548ms.
[INFO] Process phase [model]
[INFO] Process phase [generator]
[INFO] Apply generator JavaEnumerationTransformer
[INFO] Apply generator TopiaMetaTransformer
[INFO] Generate 92 files in 137.96ms.
[WARNING] Failed to getClass for org.apache.maven.plugin.source.SourceJarMojo
[INFO]
[INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence <<<
[INFO]
[INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ pollen-persistence ---
[INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO]
[INFO] --- maven-javadoc-plugin:2.9.1:jar (attach-javadocs) @ pollen-persistence ---
[INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-rest-api-nightly/org.chorem.pollen$…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ pollen-persistence ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-pgp-passphrase) @ pollen-persistence ---
[INFO] Exporting server [gpg-signer] username in ${gpg.keyname}
[INFO] Exporting server [gpg-signer] password in ${gpg.passphrase}
[INFO]
[INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-artifacts) @ pollen-persistence ---
[INFO] Loaded /var/local/forge/data/chorem.org/jenkins/workspace/pollen-rest-api-nightly/target/collect-artifacts.txt
[INFO] Copying pollen-persistence-2.0-SNAPSHOT.jar to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-rest-api-nightly/target/collect/org.chorem.pollen--pollen-persistence/pollen-persistence-2.0-SNAPSHOT.jar
[INFO] Copying THIRD-PARTY.properties to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-rest-api-nightly/target/collect/org.chorem.pollen--pollen-persistence/THIRD-PARTY.properties
[INFO] Copying pollen-persistence-2.0-SNAPSHOT-sources.jar to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-rest-api-nightly/target/collect/org.chorem.pollen--pollen-persistence/pollen-persistence-2.0-SNAPSHOT-sources.jar
[INFO] Copying pollen-persistence-2.0-SNAPSHOT-javadoc.jar to /var/local/forge/data/chorem.org/jenkins/workspace/pollen-rest-api-nightly/target/collect/org.chorem.pollen--pollen-persistence/pollen-persistence-2.0-SNAPSHOT-javadoc.jar
[INFO]
[INFO] --- helper-maven-plugin:2.1:collect-files (collect-build-attachements) @ pollen-persistence ---
[WARNING] Skipping goal (No file to collect).
[INFO]
[INFO] --- maven-gpg-plugin:1.5:sign (sign-artifacts) @ pollen-persistence ---
[INFO]
[INFO] --- maven-dependency-plugin:2.8:analyze-only (analyze) @ pollen-persistence ---
[INFO] Used declared dependencies found:
[INFO] com.google.guava:guava:jar:17.0:compile
[INFO] org.apache.commons:commons-lang3:jar:3.3.2:compile
[INFO] org.nuiton.topia:topia-persistence:jar:3.0-SNAPSHOT:compile
[WARNING] Used undeclared dependencies found:
[WARNING] org.nuiton:nuiton-utils:jar:3.0-SNAPSHOT:compile
[JENKINS] Archiving disabled
1
2
This is an automated email from the git hooks/post-receive script.
New commit to branch devel in repository pollen.
See http://git.chorem.org/pollen.git
commit becffb61268eb3d3de04f2a52bf04fd872d095fe
Author: Tony CHEMIT <chemit(a)codelutin.com>
Date: Fri May 30 11:33:51 2014 +0200
change doc url
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0e6fa41..fdc7ee1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<name>Pollen</name>
<description>Application de vote Pollen</description>
- <url>http://doc.chorem.org/pollen</url>
+ <url>http://doc.chorem.org/pollen/v2</url>
<inceptionYear>2009</inceptionYear>
<licenses>
<license>
--
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
This is an automated email from the git hooks/post-receive script.
New commit to branch devel in repository Pollen.
See http://git.None/Pollen.git
commit 6be985ec2fec88aac2be13059a792d4af4a0b379
Author: Tony CHEMIT <chemit(a)codelutin.com>
Date: Fri May 30 11:25:45 2014 +0200
do not build by default the canJs module
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7b40f7c..0e6fa41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
<module>pollen-persistence</module>
<module>pollen-services</module>
<module>pollen-rest-api</module>
- <module>pollen-ui-js</module>
+ <!--module>pollen-ui-js</module-->
<module>pollen-ui-angular</module>
</modules>
--
To stop receiving notification emails like this one, please contact
Chorem.org SCM administrator <admin+scm(a)chorem.org>.
1
0
30 May '14
See <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/537/changes>
Changes:
[Tony CHEMIT] optimize dependencies
[kmorin] add angular ui module
[Tony CHEMIT] updates mavenpom, webmotion, fix some svn:ignore
[Tony CHEMIT] update license, headers, ...
[kmorin] code improvements
[garandel] Add Create poll and vote with localstorage
[garandel] update create and vote page
[Tony CHEMIT] refs #885 : move to Topia3 stack
[garandel] un template pour creation/edition/vote de sondage
[Tony CHEMIT] refs #885
[Tony CHEMIT] technical stack is nearly ok
[Tony CHEMIT] optimze dependencies + add missing license headers
[garandel] add gobal poll controller.
[garandel] désactivation de certain modification apres le 1er vote
[Tony CHEMIT] use specific configuration files (pollen-services.properties, pollen-rest-api.properties to avoid any collision with existing config)
[Tony CHEMIT] simplify rest-api starting + add some conf
[Tony CHEMIT] simplify rest-api starting + add some conf
[Tony CHEMIT] make ui-angular war
[Tony CHEMIT] fix ui-angular war deploy
[Tony CHEMIT] pass ChoiceType to Choice, no more to Poll + add Rest Doc action + begin to add Rest API tests
[garandel] add second interface for create and vote
[Tony CHEMIT] improve tests
[garandel] fix vote in big poll template
[Tony CHEMIT] debug poll create + fix voteCounting id
[garandel] Create poll with skeleton from rest api ( http://demo.codelutin.com/pollen-rest-api-latest/v1/polls/new )
[Tony CHEMIT] - introduce email + notification service
[Tony CHEMIT] for the moment let's just authorize everybody to seel all polls
[Tony CHEMIT] make test more human readable
[Tony CHEMIT] fix PollRenderer : Hate the hibernate proxies...
[Tony CHEMIT] simplify form exception (keep only one)
[Tony CHEMIT] fix javassist double in classpath
[garandel] save poll with $http
[Tony CHEMIT] continue dev + begin of implements correct security
[Tony CHEMIT] improve rest api
[Tony CHEMIT] optimize dependenceis + add license headers + use commons-collections4
[Tony CHEMIT] begin of site v2
[Tony CHEMIT] security + sumplify exceptions + ...
[Tony CHEMIT] some dev fixes
[Tony CHEMIT] some dev fixes
[Tony CHEMIT] fix dep + clean code
[Tony CHEMIT] reformat rest api + use PollenPrincipalRef for create operations
[garandel] separate controllers editing and adding poll
[Tony CHEMIT] fix security permission
[garandel] Add list of polls for edit and vote (no security)
[garandel] Add popup setting
[garandel] update settings popup, and date popup
[garandel] migrate restangular to resource / send a single json data
[Tony CHEMIT] - receive object as json
[Tony CHEMIT] fix json serialization
[garandel] fix create poll
[Tony CHEMIT] improve conversions and lots of stuff... to be continued...
[garandel] separate element of model in $scope.data
[Tony CHEMIT] fix converter test
[Tony CHEMIT] - use a visitor to copy services objects (outside the services everything should be transient)
[Tony CHEMIT] improve copy visitor + remove old code in Render
[Tony CHEMIT] copy deleted state in entity
[garandel] fix popup setting
[garandel] edit poll
[Tony CHEMIT] fix format
[Tony CHEMIT] use a copy
[garandel] separe choices and poll
[garandel] autosave choice with ChoiceApi
[garandel] test PUT by POST (edit poll)
[Tony CHEMIT] do not send back an edited object + clean some api
[Tony CHEMIT] fix poll update :) at last\!
[Tony CHEMIT] fix test package
[Tony CHEMIT] use previous X header which works fine
[Tony CHEMIT] somebody lies to me\! He told me it did not need edited value in return, but he does in facts... D
[Tony CHEMIT] always prepare response even if there was an error
[Tony CHEMIT] implements CORS response from pollen not webmotion
[Tony CHEMIT] optimize dependencies
[garandel] Add global conf in js/conf.js
[garandel] print error in form
[garandel] add persistance vote
[Tony CHEMIT] introduce converter package + a JsonConverter to replace the EntityConverter + add some bean for vote
[Tony CHEMIT] can not delete last choice of a poll
[Tony CHEMIT] can now vote
[athimel] Fix sample REST base URL
[Tony CHEMIT] copy voter to VoteBean
[Tony CHEMIT] copy votes
[garandel] vote persistant
[garandel] fix vote persitence
[garandel] autoprint new vote
[garandel] - delete debug code
[Tony CHEMIT] use only pollen bean in services prototypes
[Tony CHEMIT] fix vote choice order
[garandel] debug ui and translate to french all element
[Tony CHEMIT] begin of rest api
[Tony CHEMIT] add default resultVisibility option
[Tony CHEMIT] rename session cookie name
[Tony CHEMIT] add a create entity ref after login
[Tony CHEMIT] i18n on validation
[Tony CHEMIT] use a real session object stored in cookie
[Tony CHEMIT] review login workflow
[Tony CHEMIT] fixes #1029 Migrate to Git.
[Tony CHEMIT] fixes #1029 Migrate to Git.
[Tony CHEMIT] fixes #1029 Migrate to Git.
[Tony CHEMIT] add ignore files
[Tony CHEMIT] remove idea files from scm
[Tony CHEMIT] Revert "remove idea files from scm"
[Tony CHEMIT] ignore idea files
[dralagen] update gitignore
[dralagen] add token and local in request REST
[a.garandel] Complet info locale and token for all services
[Tony CHEMIT] Reuse Gson + fix vote choices order
[a.garandel] convert int to float javascript
[a.garandel] delete unused dependence
[a.garandel] use header for locale
[a.garandel] Add form register new user
[a.garandel] login user
[a.garandel] delete conflit on ui conf.js
[a.garandel] fix register user
[Tony CHEMIT] make login works
[a.garandel] catch error in form register
[Tony CHEMIT] change login result
[Tony CHEMIT] use a header to get session token
[Tony CHEMIT] fix typo
[a.garandel] change fonction name for save and delete poll
[a.garandel] change style form register
[a.garandel] Fix Header Accept-Language value,
[a.garandel] update gitignore
[a.garandel] fix create poll
[a.garandel] Print name or login user when connected
[a.garandel] fix style dropdown in navbar
[a.garandel] add another default user
[a.garandel] fix createDefaultUsers
[a.garandel] Add logout
[a.garandel] change cookies to localStorage
[Tony CHEMIT] improve auth service and make logout works
[a.garandel] Unified Session Data on one factory
[a.garandel] save currentUser
[a.garandel] print error for log
[a.garandel] fix print error in register and voter name,
[Tony CHEMIT] Add sessionToken remove logic
[a.garandel] implement list of poll created by user
[a.garandel] add security for list all poll
[a.garandel] reload page when connect and disconnect
[a.garandel] admin menu
[a.garandel] add list poll created
[a.garandel] delete token in url in list poll
[a.garandel] complete menu
[a.garandel] check permission for edit poll
[Tony CHEMIT] update libs
[Tony CHEMIT] remove permissions + clean service code
[Tony CHEMIT] make security works in tests + downgrade tomcat version
[a.garandel] catch session expired
[Tony CHEMIT] change error code when session token is expired
[Tony CHEMIT] vote counting service
[Tony CHEMIT] fix build + improve gitignore
[Tony CHEMIT] fix runtime dep
[a.garandel] send permission for getting poll and choices
[a.garandel] move to / when error 403
[a.garandel] print result in vote page
[a.garandel] alert floatant
[a.garandel] print result
[Tony CHEMIT] improve favorite list model
[a.garandel] add link for edit poll and vote
[a.garandel] add link for edit vote
[a.garandel] use promise for get result
[a.garandel] fix right : connected and permission
[a.garandel] print good link for edit. Print vote in edit mode
[Tony CHEMIT] encode ids
[Tony CHEMIT] use everywhere PollenEntityId
[Tony CHEMIT] introduce json helper + use a PollenEntityRef
[a.garandel] set home page for poll
[a.garandel] update tab and save permission on offline
[a.garandel] create a page for result
[a.garandel] update home interface of poll
[Tony CHEMIT] use bean for vote counting result (to encore ids)
[Tony CHEMIT] fix test
[a.garandel] Fix url
[a.garandel] suppr debug code
[a.garandel] Add Comment
[Tony CHEMIT] can add comment on a free poll with no rights
[a.garandel] update style of form comment, get permission of the poll
[Tony CHEMIT] Use pagination list for comments, polls, favoriteLists and users + improve PollenBeans API
[Tony CHEMIT] Use pagination list for comments, polls, favoriteLists and users + improve PollenBeans API
[Tony CHEMIT] use text type for poll.description, choice.description, comment.text
[Tony CHEMIT] rename pagination beans
[Tony CHEMIT] Improve pagination API
[a.garandel] get poll with pagination
[a.garandel] fix url tab,
[a.garandel] create directive for pagination
[a.garandel] update pagination and add pagination in comments
[a.garandel] Add default page size in conf
[a.garandel] change favoriteDefaultPageSize to favoriteListDefaultPageSize
[Tony CHEMIT] check password is not blank
[a.garandel] add form for edit user
[a.garandel] update style of form
[Tony CHEMIT] fix password in form
[a.garandel] beautifull form for register
[Tony CHEMIT] use only email as login
[Tony CHEMIT] review favorite list member and voter list member association
[Tony CHEMIT] update scm informations
[Tony CHEMIT] add todo
------------------------------------------
[...truncated 1411 lines...]
10:53:22 INFO (VoteCountingFactory.java:72) Detected strategy [5-Borda] : org.chorem.pollen.votecounting.BordaVoteCounting
10:53:22 INFO (VoteCountingFactory.java:72) Detected strategy [6-Instant Runoff] : org.chorem.pollen.votecounting.InstantRunoffVoteCounting
10:53:22 INFO (VoteCountingFactory.java:72) Detected strategy [7-Coombs] : org.chorem.pollen.votecounting.CoombsVoteCounting
10:53:22 INFO (FixturesService.java:82) will restore database with fixture set
10:53:22 INFO (SecurityService.java:336) All permissions:
*:addComment:org.chorem.pollen.persistence.entity.Poll_55be04ab-f317-4373-aea5-5758d8cbde70
*:readChoice:org.chorem.pollen.persistence.entity.Choice_45404de2-7093-45a4-87e3-9ad8f411ac46
*:readPoll:org.chorem.pollen.persistence.entity.Poll_55be04ab-f317-4373-aea5-5758d8cbde70
*:readChoice:org.chorem.pollen.persistence.entity.Choice_f75a123c-c271-45ad-8b60-d8fb236a40a5
*:addVote:org.chorem.pollen.persistence.entity.Poll_55be04ab-f317-4373-aea5-5758d8cbde70
10:53:22 INFO (SecurityService.java:336) All permissions:
*:*:*
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.754 sec - in org.chorem.pollen.services.service.FavoriteListServiceTest
Results :
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ pollen-services ---
[INFO] Building jar: <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-services/targ…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ pollen-services ---
[JENKINS] Archiving disabled
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Pollen :: Rest Api 2.0-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/debux/webmoti…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/debux/webmoti… (2 KB at 1.3 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/debux/webmoti…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/debux/webmoti… (613 B at 1.7 KB/sec)
[WARNING] The POM for org.antlr:stringtemplate:jar:3.2.1 is invalid, transitive dependencies (if any) will not be available, enable debug logging for more details
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/debux/webmoti…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/debux/webmoti… (2 KB at 3.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/httpco…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/httpco… (5 KB at 124.8 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/fluent-hc/4.3…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/fluent-hc/4.3… (5 KB at 169.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (2 KB at 53.3 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-co…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-co… (2 KB at 69.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (2 KB at 47.1 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-ja…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-ja… (2 KB at 62.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/eclipse/jdt/c…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/eclipse/jdt/c… (2 KB at 48.4 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.3.1…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.3.1… (2 KB at 55.5 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (2 KB at 36.1 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo… (2 KB at 49.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (2 KB at 33.4 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo… (2 KB at 49.5 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/httpco…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/eclipse/jdt/c…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/httpco… (29 KB at 500.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (38 KB at 250.2 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (83 KB at 559.9 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (781 KB at 2109.8 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/apache/tomcat… (2804 KB at 5965.1 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/pollen-group/org/eclipse/jdt/c… (1788 KB at 3405.5 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/fluent-hc/4.3…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-co…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-ja…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.3.1…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/fluent-hc/4.3… (29 KB at 1037.9 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo… (83 KB at 2239.7 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-lo… (38 KB at 250.2 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-ja… (781 KB at 3903.1 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.3.1… (1788 KB at 6903.0 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/tomcat/embed/tomcat-embed-co… (2804 KB at 10048.7 KB/sec)
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ pollen-rest-api ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ pollen-rest-api ---
[INFO]
[INFO] >>> i18n-maven-plugin:3.1:bundle (default) @ pollen-rest-api >>>
[INFO]
[INFO] --- i18n-maven-plugin:3.1:collect-i18n-artifacts (collect-i18n-artifacts) @ pollen-rest-api ---
[WARNING] Invalid POM for org.antlr:stringtemplate:jar:3.2.1, transitive dependencies (if any) will not be available, enable debug logging for more details
[INFO] Downloading: https://oss.sonatype.org/content/repositories/snapshots/org/debux/webmotion…
[INFO] Downloaded: https://oss.sonatype.org/content/repositories/snapshots/org/debux/webmotion… (2 KB at 0.5 KB/sec)
[INFO] Downloading: https://oss.sonatype.org/content/repositories/snapshots/org/debux/webmotion…
[INFO] Downloaded: https://oss.sonatype.org/content/repositories/snapshots/org/debux/webmotion… (613 B at 2.2 KB/sec)
[INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/targ…>
[INFO] collected 10 i18n artifacts for locale en_GB stored in <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/targ…>
[INFO]
[INFO] <<< i18n-maven-plugin:3.1:bundle (default) @ pollen-rest-api <<<
[INFO]
[INFO] --- i18n-maven-plugin:3.1:bundle (default) @ pollen-rest-api ---
[WARNING] bundle fr_FR contains 12/115 empty entries! (use -Di18n.showEmpty to see these entries)
[WARNING] bundle en_GB contains 13/116 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ pollen-rest-api ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ pollen-rest-api ---
[INFO] Compiling 25 source files to <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/targ…>
[INFO] -------------------------------------------------------------
[WARNING] COMPILATION WARNING :
[INFO] -------------------------------------------------------------
[WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/src/…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/src/…>: Recompile with -Xlint:unchecked for details.
[INFO] 2 warnings
[INFO] -------------------------------------------------------------
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/src/…>:[72,67] method addVoterList in class org.chorem.pollen.services.service.VoterListService cannot be applied to given types;
required: java.lang.String,org.chorem.pollen.services.bean.VoterListBean,java.util.List<org.chorem.pollen.services.bean.VoterListMemberBean>
found: java.lang.String,org.chorem.pollen.services.bean.VoterListBean
reason: actual and formal argument lists differ in length
[INFO] 1 error
[INFO] -------------------------------------------------------------
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Pollen ............................................ SUCCESS [ 1.582 s]
[INFO] Pollen :: VoteCounting (Api) ...................... SUCCESS [ 5.519 s]
[INFO] Pollen :: VoteCounting :: Normal .................. SUCCESS [ 1.390 s]
[INFO] Pollen :: VoteCounting :: Percentage .............. SUCCESS [ 1.266 s]
[INFO] Pollen :: VoteCounting :: Condorcet ............... SUCCESS [ 1.237 s]
[INFO] Pollen :: VoteCounting :: Number .................. SUCCESS [ 1.155 s]
[INFO] Pollen :: VoteCounting :: Borda ................... SUCCESS [ 1.206 s]
[INFO] Pollen :: VoteCounting :: Instant Runoff .......... SUCCESS [ 1.136 s]
[INFO] Pollen :: VoteCounting :: Coombs .................. SUCCESS [ 1.126 s]
[INFO] Pollen :: VoteCounting (Aggregator) ............... SUCCESS [ 0.229 s]
[INFO] Pollen :: Persistence ............................. SUCCESS [ 6.200 s]
[INFO] Pollen :: Service ................................. SUCCESS [ 9.601 s]
[INFO] Pollen :: Rest Api ................................ FAILURE [ 7.721 s]
[INFO] Pollen :: UI (CanJS) .............................. SKIPPED
[INFO] Pollen :: UI (Angular) ............................ SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 41.759 s
[INFO] Finished at: 2014-05-30T10:53:31+01:00
[INFO] Final Memory: 63M/384M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project pollen-rest-api: Compilation failure
[ERROR] <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/src/…>:[72,67] method addVoterList in class org.chorem.pollen.services.service.VoterListService cannot be applied to given types;
[ERROR] required: java.lang.String,org.chorem.pollen.services.bean.VoterListBean,java.util.List<org.chorem.pollen.services.bean.VoterListMemberBean>
[ERROR] found: java.lang.String,org.chorem.pollen.services.bean.VoterListBean
[ERROR] reason: actual and formal argument lists differ in length
[ERROR] -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project pollen-rest-api: Compilation failure
<http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/src/…>:[72,67] method addVoterList in class org.chorem.pollen.services.service.VoterListService cannot be applied to given types;
required: java.lang.String,org.chorem.pollen.services.bean.VoterListBean,java.util.List<org.chorem.pollen.services.bean.VoterListMemberBean>
found: java.lang.String,org.chorem.pollen.services.bean.VoterListBean
reason: actual and formal argument lists differ in length
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76)
at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure
<http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/pollen-rest-api/src/…>:[72,67] method addVoterList in class org.chorem.pollen.services.service.VoterListService cannot be applied to given types;
required: java.lang.String,org.chorem.pollen.services.bean.VoterListBean,java.util.List<org.chorem.pollen.services.bean.VoterListMemberBean>
found: java.lang.String,org.chorem.pollen.services.bean.VoterListBean
reason: actual and formal argument lists differ in length
at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858)
at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
... 30 more
[ERROR]
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <goals> -rf :pollen-rest-api
Sending e-mails to: pollen-commits(a)list.chorem.org garandel@5be0c24c-0eb0-4881-9616-eb0573c84113 chemit+chorem-ci(a)codelutin.com a.garandel(a)dralagen.fr
channel stopped
1
3