- Pollen-commits - mailman.cloud.codelutin.com

01/01: Reuse Gson + fix vote choices order
by Chorem.org scm May 19, 2014

May 19, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 819759fe8a3e49185a21a6de1be845b82d33b6a1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon May 19 15:57:46 2014 +0200 Reuse Gson + fix vote choices order --- pollen-rest-api/pom.xml | 22 +------ .../org/chorem/pollen/rest/api/PollenRender.java | 21 +------ .../rest/api/PollenRestApiApplicationListener.java | 4 + .../chorem/pollen/rest/api/PollenRestApiUtil.java | 65 ++++++++++++++------ .../pollen/rest/api/converter/DateConverter.java | 35 +++++++++++ .../rest/api/converter/JsonArrayConverter.java | 19 ++---- .../pollen/rest/api/converter/JsonConverter.java | 46 ++------------ .../org/chorem/pollen/services/bean/VoteBean.java | 3 +- .../pollen/services/service/VoteServiceTest.java | 20 ++++++ pom.xml | 30 +-------- 10 files changed, 127 insertions(+), 138 deletions(-) diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index c4cb8fc..4680c26 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -78,11 +78,6 @@ </dependency> <dependency> - <groupId>javax</groupId> - <artifactId>javaee-api</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -108,24 +103,9 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> -  - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-afterburner</artifactId> </dependency> <dependency> diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java index 50b2811..e2ee51a 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java @@ -23,9 +23,8 @@ package org.chorem.pollen.rest.api; * #L% */ -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; import com.google.common.collect.Multimap; +import com.google.gson.Gson; import org.chorem.pollen.services.service.InvalidFormException; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.HttpContext; @@ -62,34 +61,20 @@ public class PollenRender<T> extends Render { Object map; - ObjectMapper mapper; - if (model instanceof InvalidFormException) { response.setStatus(HttpServletResponse.SC_BAD_REQUEST); } - mapper = PollenRestApiUtil.newSimpleMapper(); - map = toMap(model); PollenRestApiApplicationContext applicationContext = PollenRestApiApplicationContext.getApplicationContext(context.getServletContext()); boolean devMode = applicationContext.getApplicationConfig().isDevMode(); - String json; - - if (devMode) { - - ObjectWriter objectWriter = mapper.writerWithDefaultPrettyPrinter(); - json = objectWriter.writeValueAsString(map); - - } else { - - json = mapper.writeValueAsString(map); - - } + Gson gson = PollenRestApiUtil.newGson(devMode); + String json = gson.toJson(map); PrintWriter out = context.getOut(); out.print(json); diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java index 494dd4a..d5be352 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationListener.java @@ -24,6 +24,7 @@ package org.chorem.pollen.rest.api; */ import com.google.common.collect.Sets; +import org.chorem.pollen.rest.api.converter.DateConverter; import org.chorem.pollen.rest.api.converter.JsonArrayConverter; import org.chorem.pollen.rest.api.converter.JsonConverter; import org.chorem.pollen.services.PollenService; @@ -43,6 +44,7 @@ import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; import java.lang.reflect.Type; +import java.util.Date; import java.util.Set; /** @@ -70,6 +72,8 @@ public class PollenRestApiApplicationListener implements WebMotionServerListener // --- init converters --- // + serverContext.addConverter(new DateConverter(), Date.class); + for (Class<?> beanType : BEAN_TYPES) { serverContext.addConverter(JsonConverter.newConverter(beanType), beanType); diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java index 6d5b6a6..5a9c6ae 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java @@ -1,15 +1,22 @@ package org.chorem.pollen.rest.api; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.afterburner.AfterburnerModule; import com.google.common.collect.Lists; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.call.HttpContext; import javax.servlet.http.HttpServletResponse; +import java.lang.reflect.Type; +import java.util.Date; import java.util.List; /** @@ -35,20 +42,9 @@ public class PollenRestApiUtil { return list; } - public static ObjectMapper newSimpleMapper() { + public static String entitiesToString(Object o) { - ObjectMapper mapper = new ObjectMapper() - .configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true) - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) //FIXME Could be better ? - .registerModule(new AfterburnerModule()); - - return mapper; - - } - - public static String entitiesToString(Object o) throws JsonProcessingException { - - return newSimpleMapper().writeValueAsString(o); + return newGson(true).toJson(o); } @@ -88,4 +84,37 @@ public class PollenRestApiUtil { context.getResponse().addHeader(HEADER_ACCESS_CONTROL_ALLOW_HEADERS, requestHeaders); } } + + public static Gson newGson(boolean prettyPrint) { + + GsonBuilder gsonBuilder = new GsonBuilder(); + gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() { + + @Override + public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) { + if (src == null) { + return JsonNull.INSTANCE; + } + return new JsonPrimitive(src.getTime()); + } + + }); + gsonBuilder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() { + + @Override + public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + return new Date(json.getAsLong()); + } + + }); + if (prettyPrint) { + + gsonBuilder.setPrettyPrinting(); + + } + + Gson gson = gsonBuilder.create(); + return gson; + + } } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/DateConverter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/DateConverter.java new file mode 100644 index 0000000..590bc91 --- /dev/null +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/DateConverter.java @@ -0,0 +1,35 @@ +package org.chorem.pollen.rest.api.converter; + +import org.apache.commons.beanutils.converters.AbstractConverter; + +import java.util.Date; + +/** + * Created on 5/19/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class DateConverter extends AbstractConverter { + + @Override + protected <T> T convertToType(Class<T> type, Object value) throws Throwable { + Date result = null; + if (value != null) { + if (value.getClass().isAssignableFrom(Date.class)) { + result = (Date) value; + } else { + Object o = ((Object[]) value)[0]; + String sTime = o.toString(); + Long time = Long.parseLong(sTime); + result = new Date(time); + } + } + return (T) result; + } + + @Override + protected Class<?> getDefaultType() { + return Date.class; + } +} diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonArrayConverter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonArrayConverter.java index 63abb75..6dac6ca 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonArrayConverter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonArrayConverter.java @@ -1,11 +1,9 @@ package org.chorem.pollen.rest.api.converter; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; import org.apache.commons.beanutils.converters.AbstractConverter; import org.chorem.pollen.rest.api.PollenRestApiUtil; -import org.chorem.pollen.services.PollenTechnicalException; -import java.io.IOException; import java.lang.reflect.Array; /** @@ -18,7 +16,7 @@ public class JsonArrayConverter<O> extends AbstractConverter { protected final Class<O[]> arrayType; - protected final ObjectMapper mapper; + protected final Gson gson; public static <O> JsonArrayConverter<O> newConverter(Class<O> objectType) { return new JsonArrayConverter<>(objectType); @@ -26,7 +24,7 @@ public class JsonArrayConverter<O> extends AbstractConverter { public JsonArrayConverter(Class<O> entityType) { this.arrayType = getArrayClass(entityType); - this.mapper = PollenRestApiUtil.newSimpleMapper(); + this.gson = PollenRestApiUtil.newGson(false); } <T> Class<T[]> getArrayClass(Class<T> clazz) { @@ -48,14 +46,9 @@ public class JsonArrayConverter<O> extends AbstractConverter { } - try { - - O[] values = mapper.readValue(stringValue, this.arrayType); - return (T) values; - - } catch (IOException e) { - throw new PollenTechnicalException("Could not convert " + stringValue + " to " + type.getName(), e); - } + O[] values = gson.fromJson(stringValue, this.arrayType); +// O[] values = mapper.readValue(stringValue, this.arrayType); + return (T) values; } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java index c649ba2..abe3f4d 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java @@ -21,16 +21,12 @@ package org.chorem.pollen.rest.api.converter; * #L% */ -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; +import com.google.gson.Gson; import org.apache.commons.beanutils.converters.AbstractConverter; import org.chorem.pollen.persistence.PollenEntityEnum; import org.chorem.pollen.rest.api.PollenRestApiUtil; -import org.chorem.pollen.services.PollenTechnicalException; import org.nuiton.topia.persistence.TopiaEntity; -import java.io.IOException; - /** * Created on 5/6/14. * @@ -43,7 +39,7 @@ public class JsonConverter<O> extends AbstractConverter { protected Class<O> implementationClass; - protected ObjectMapper mapper; + protected final Gson gson; public static <O> JsonConverter<O> newConverter(Class<O> objectType) { return newConverter(objectType, objectType); @@ -61,38 +57,14 @@ public class JsonConverter<O> extends AbstractConverter { public JsonConverter(Class<O> objectType, Class<O> implementationClass) { this.objectType = objectType; - + this.gson = PollenRestApiUtil.newGson(false); this.implementationClass = implementationClass; - - SimpleModule module = new SimpleModule(); - - if (objectType != implementationClass) { - - module.addAbstractTypeMapping(objectType, implementationClass); - - } - - for (Class<? extends TopiaEntity> entityClass : PollenEntityEnum.getContractClasses()) { - - Class concreteClass = PollenEntityEnum.getImplementationClass(entityClass); - module.addAbstractTypeMapping(entityClass, concreteClass); - - } - - mapper = PollenRestApiUtil.newSimpleMapper(); - - } - - public ObjectMapper getMapper() { - - return mapper; - } @Override protected String convertToString(Object value) throws Throwable { - String result = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(value); + String result = gson.toJson(value); return result; } @@ -112,15 +84,9 @@ public class JsonConverter<O> extends AbstractConverter { } - try { - - T result = (T) mapper.readValue(stringValue, implementationClass); - - return result; + T result = (T) gson.fromJson(stringValue, implementationClass); - } catch (IOException e) { - throw new PollenTechnicalException("Could not convert " + stringValue + " to " + type.getName(), e); - } + return result; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java index 3e7a7a9..e5d99f2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/VoteBean.java @@ -9,6 +9,7 @@ import org.chorem.pollen.persistence.entity.VoteToChoices; import java.util.ArrayList; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -30,7 +31,7 @@ public class VoteBean extends PollenBean<Vote> { protected Boolean anonymous; - protected Set<VoteToChoiceBean> choice = new HashSet<>(); + protected Set<VoteToChoiceBean> choice = new LinkedHashSet<>(); @Override public void fromEntity(Vote vote) { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java new file mode 100644 index 0000000..78e69bc --- /dev/null +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoteServiceTest.java @@ -0,0 +1,20 @@ +package org.chorem.pollen.services.service; + +import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.chorem.pollen.services.service.security.SecurityService; +import org.junit.Test; + +public class VoteServiceTest extends AbstractPollenServiceTest { + + protected PollService pollService; + + protected VoteService service; + + protected SecurityService securityService; + + @Test + public void addVote() throws Exception { + + //TODO + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index f23caff..e159774 100644 --- a/pom.xml +++ b/pom.xml @@ -410,34 +410,10 @@ <version>${httpCommonsHttpclientVersion}</version> </dependency> -  - -  - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>2.3.3</version> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.3.3</version> - </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-afterburner</artifactId> - <version>2.3.3</version> </dependency> <dependency> @@ -636,12 +612,12 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> + <artifactId>nuiton-maven-report-plugin</artifactId> <version>3.0-rc-1</version> <reportSets> <reportSet> <reports> - <report>aggregate-application-config-report</report> + <report>aggregate-config-report</report> </reports> </reportSet> </reportSets> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

Build failed in Jenkins: pollen-rest-api-ci #1
by admin+ci-chorem.org＠codelutin.com May 19, 2014

May 19, 2014

See <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/1/> ------------------------------------------ Started by an SCM change Building in workspace <http://ci.chorem.org/jenkins/job/pollen-rest-api-ci/ws/> Cloning the remote Git repository Cloning repository https://git.chorem.org/pollen.git Fetching upstream changes from https://git.chorem.org/pollen.git using .gitcredentials to set credentials Could not remove the credential section from the git configuration ERROR: Error cloning remote repo 'origin' hudson.plugins.git.GitException: Command "git config --local credential.helper store --file=/var/local/forge/exec/tomcat-chorem.org/temp/git7180121830511207279.credentials" returned status code 129: stdout: stderr: error: unknown option `local' usage: git config [options] Config file location --global use global config file --system use system config file -f, --file <FILE> use given config file Action --get get value: name [value-regex] --get-all get all values: key [value-regex] --get-regexp get values for regexp: name-regex [value-regex] --replace-all replace all matching variables: name value [value_regex] --add adds a new variable: name value --unset removes a variable: name [value-regex] --unset-all removes all matches: name [value-regex] --rename-section rename section: old-name new-name --remove-section remove a section: name -l, --list list all -e, --edit opens an editor --get-color <slot> find the color configured: [default] --get-colorbool <slot> find the color setting: [stdout-is-tty] Type --bool value is "true" or "false" --int value is decimal number --bool-or-int value is --bool or --int --path value is a path (file or directory name) Other -z, --null terminate values with NUL byte at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1276) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1253) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1249) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1245) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1142) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$200(CliGitAPIImpl.java:87) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:254) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$2.execute(CliGitAPIImpl.java:410) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:847) 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) ERROR: null

1 2

01/01: Complet info locale and token for all services
by Chorem.org scm May 19, 2014

May 19, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit c4dc92787eec76dc19890257da9b7475aec4049d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 11:29:14 2014 +0200 Complet info locale and token for all services --- .../src/main/webapp/js/controllers/pollCtrl.js | 4 +--- pollen-ui-angular/src/main/webapp/js/services.js | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 99b3134..fc7ee83 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -19,9 +19,7 @@ * #L% */ angular.module('pollControllers', []) -.controller('HomeCtrl', ['$scope', '$locale', '$cookieStore', function ($scope, $locale, $cookieStore) { - - $scope.test = $cookieStore.get('locale'); +.controller('HomeCtrl', ['$scope', function ($scope) { }]) .controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$cookies', function ($scope, $controller, $sce, $timeout, $cookies) { diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index f2d25fd..4a5306c 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -28,7 +28,7 @@ angular.module('pollenServices', ['ngResource']) } if (angular.isDefined($cookies.token)) { - query += '&token='+$cookies.token; + query += '&permission='+$cookies.token; } query += '&locale='+$cookies.locale; @@ -57,9 +57,9 @@ angular.module('pollenServices', ['ngResource']) }); }]) -.factory('PollChoice', ['$resource', function ($resource) { +.factory('PollChoice', ['$resource', 'RestInfo', function ($resource, RestInfo) { var transformParam = function (data) { - return 'choice='+encodeURIComponent(JSON.stringify(data)); + return 'choice='+encodeURIComponent(JSON.stringify(data))+RestInfo; }; return $resource(conf.restURL+'/polls/:pollId/choices/:choiceId', {choiceId : '@id'}, @@ -81,9 +81,9 @@ angular.module('pollenServices', ['ngResource']) ); }]) -.factory('PollVote', ['$resource', function ($resource) { +.factory('PollVote', ['$resource', 'RestInfo', function ($resource, RestInfo) { var transformParam = function (data) { - return 'vote='+encodeURIComponent(JSON.stringify(data)); + return 'vote='+encodeURIComponent(JSON.stringify(data))+RestInfo; }; return $resource(conf.restURL+'/polls/:pollId/votes/:voteId', {voteId : '@id'}, -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: add token and local in request REST
by Chorem.org scm May 19, 2014

May 19, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 55c108d670f2a6861ed71243eed55d7675019746 Author: Dralagen <dralagen(a)dralagen.fr> Date: Mon May 19 10:33:32 2014 +0200 add token and local in request REST --- pollen-ui-angular/src/main/webapp/css/style.css | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 16 ++++-- pollen-ui-angular/src/main/webapp/js/services.js | 22 +++++++- .../src/main/webapp/partials/inline-poll.html | 7 ++- .../src/main/webapp/partials/poll-settings.html | 50 ++++++++++---------- .../src/main/webapp/partials/poll.html | 2 +- 6 files changed, 62 insertions(+), 39 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 92ff93f..f2100ed 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -1,8 +1,8 @@ /* * #%L * Pollen :: UI (JS) - * $Id$ - * $HeadURL$ + * $Id: style.css 3943 2014-05-15 10:23:42Z garandel $ + * $HeadURL: https://svn.chorem.org/pollen/trunk/pollen-ui-angular/src/main/webapp/css/s… $ * %% * Copyright (C) 2009 - 2013 CodeLutin * %% diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index 9968e5a..99b3134 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -19,14 +19,16 @@ * #L% */ angular.module('pollControllers', []) -.controller('HomeCtrl', ['$scope', function ($scope) { +.controller('HomeCtrl', ['$scope', '$locale', '$cookieStore', function ($scope, $locale, $cookieStore) { + $scope.test = $cookieStore.get('locale'); }]) -.controller('PollCtrl', ['$scope', '$sce', '$timeout', '$cookieStore', function ($scope, $sce, $timeout, $cookieStore) { +.controller('PollCtrl', ['$scope', '$controller', '$sce', '$timeout', '$cookies', function ($scope, $controller, $sce, $timeout, $cookies) { + if (!angular.isDefined($scope.globalVariables)) { - $scope.globalVariables = {saved : $cookieStore.get('saved')}; - $cookieStore.put('saved', ''); + $scope.globalVariables = {saved : $cookies.saved}; + delete $cookies.saved $scope.$watch('globalVariables.saved', function() { $timeout(function () { @@ -165,7 +167,7 @@ angular.module('pollControllers', []) } }]) -.controller('PollCreateCtrl', ['$scope', '$controller', '$location', 'Poll', '$cookieStore', function ($scope, $controller, $location, Poll, $cookieStore) { +.controller('PollCreateCtrl', ['$scope', '$controller', '$location', 'Poll', '$cookies', function ($scope, $controller, $location, Poll, $cookies) { $controller('PollAdminCtrl', {$scope:$scope}); $scope.globalVariables.create = true; @@ -185,7 +187,7 @@ angular.module('pollControllers', []) var poll = angular.copy($scope.data.poll); poll.choice = angular.copy($scope.data.choices); Poll.add(poll, function (data) { - $cookieStore.put('saved', true); + $cookies.saved = true; $location.url('/poll/edit/'+data.id+'?token='+data.permission); }, function (error) { $scope.globalVariables.restError = true; @@ -327,6 +329,8 @@ angular.module('pollControllers', []) $scope.data.votants.push(angular.copy($scope.data.vote)); $scope.globalVariables.saved = true; initVote(); + }, function (error) { + $scope.data.vote.restError = { voterName : error.data["voter.name"]}; }); } }]) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 62d45e4..f2d25fd 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -20,8 +20,24 @@ */ angular.module('pollenServices', ['ngResource']) -.factory('Poll', ['$resource', function ($resource) { +.factory('RestInfo', ['$cookies', '$locale', function ($cookies, $locale) { + var query = ''; + if (!angular.isDefined($cookies.locale)) { + $cookies.locale = $locale.id; + } + + if (angular.isDefined($cookies.token)) { + query += '&token='+$cookies.token; + } + + query += '&locale='+$cookies.locale; + + return query; + +}]) + +.factory('Poll', ['$resource', 'RestInfo', function ($resource, RestInfo) { return $resource(conf.restURL+'/polls/:pollId/:cmd', {pollId:'@id'}, { 'add' : { method : 'POST', @@ -29,13 +45,13 @@ angular.module('pollenServices', ['ngResource']) var poll = angular.copy(data); delete poll.choice; var choices = angular.copy(data.choice); - return 'poll='+encodeURIComponent(JSON.stringify(poll))+'&choices='+encodeURIComponent(JSON.stringify(choices)); + return 'poll='+encodeURIComponent(JSON.stringify(poll))+'&choices='+encodeURIComponent(JSON.stringify(choices))+RestInfo; } }, 'update' : { method : 'POST', transformRequest : function (data, headersGetter) { - return 'poll='+encodeURIComponent(JSON.stringify(data)); + return 'poll='+encodeURIComponent(JSON.stringify(data))+RestInfo; } } }); diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 909d96e..840a498 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -29,7 +29,7 @@ <div ng-if="choice.choiceType == 'TEXT'" edit-me="showEdit" > <div ng-hide="showEdit && !globalVariables.voted" class="fixe-input" title="{{choice.description}}"> {{choice.name || 'click pour éditer'}} - <info-Error error="choice.restError.name[0]" data="choice.name"></info-Error> + <info-error error="choice.restError.name[0]" data="choice.name"></info-error> <input type="button" class="btn btn-default" ng-if="!globalVariables.voted && globalVariables.editMode" ng-show="showEditHover" ng-click="editChoice(choice)" value="..."/></div> <div ng-show="showEdit && !globalVariables.voted"> <input type="text" class="form-control" ng-model="choice.name" focus-me="showEdit" ng-exit="showEdit = false;" auto-save="saveChoice(choice)" required/> @@ -50,7 +50,10 @@  <tr ng-show="!globalVariables.editMode"> - <td class="pollChoice"> <input type="text" class="form-control" placeholder="votre nom" ng-model="data.vote.voterName" /> </td> + <td class="pollChoice"> + <input type="text" class="form-control" placeholder="votre nom" ng-model="data.vote.voterName" /> + <info-error error="data.vote.restError.voterName" data="data.vote.voteName"></info-error> + </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice"> <input type="checkbox" name="{{choice.choice.topiaId}}" ng-model="choice.voteValue" /> </td> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html index 923c79e..590a527 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-settings.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-settings.html @@ -23,8 +23,8 @@ <h4>Confiuration global</h4> <div class="form-group"> - <label class="col-lg-4 control-label" for="beginDate">Date de début : </label> - <div class="col-lg-8"> + <label class="col-sm-4 control-label" for="beginDate">Date de début : </label> + <div class="col-sm-8"> <input id="beginDate" class="form-control" type="text" datepicker-popup="dd/MM/yyyy" min-date="toDay" @@ -36,8 +36,8 @@ </div> <div class="form-group"> - <label class="col-lg-4 control-label" for="endDate">Date de fin : </label> - <div class="col-lg-8"> + <label class="col-sm-4 control-label" for="endDate">Date de fin : </label> + <div class="col-sm-8"> <input id="endDate" class="form-control" type="text" datepicker-popup="dd/MM/yyyy" min-date="data.poll.beginDate" @@ -48,14 +48,14 @@ </div> <div class="form-group"> - <label class="col-lg-4 control-label">Résultat : </label> - <div class="col-lg-8"> + <label class="col-sm-4 control-label">Résultat : </label> + <div class="col-sm-8"> <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="EVERYBODY" /> Public</label> <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="VOTER" /> Participants</label> <label><input type="radio" ng-model="data.poll.resultVisibility" name="resultVisibility" value="CREATOR" /> Créateur</label> </div> <!-- - <div class="col-lg-8 btn-group"> + <div class="col-sm-8 btn-group"> <button type="button" class="btn btn-success" ng-model="data.poll.resultVisibility" btn-radio="'EVERYBODY'">Public</button> <button type="button" class="btn btn-success" ng-model="data.poll.resultVisibility" btn-radio="'VOTER'">Participants</button> <button type="button" class="btn btn-success" ng-model="data.poll.resultVisibility" btn-radio="'CREATOR'">Créateur</button> @@ -64,8 +64,8 @@ </div> <div class="form-group"> - <label class="col-lg-4 control-label">Résultat continue : </label> - <div class="col-lg-8 btn-group"> + <label class="col-sm-4 control-label">Résultat continue : </label> + <div class="col-sm-8 btn-group"> <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="true">Oui</button> <button class="btn btn-default" ng-model="data.poll.continuousResults" btn-radio="false">Non</button> </div> @@ -74,16 +74,16 @@ <h4>Configuration des Choix</h4> <div class="form-group"> - <label class="col-lg-4 control-label">Ajout de choix par les votants :</label> - <div class="col-lg-8 btn-group"> + <label class="col-sm-4 control-label">Ajout de choix par les votants :</label> + <div class="col-sm-8 btn-group"> <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="true">Oui</button> <button class="btn btn-default" ng-model="data.poll.choiceAddAllowed" btn-radio="false">Non</button> </div> </div> <div class="form-group" ng-show="data.poll.choiceAddAllowed"> - <label class="col-lg-4 control-label" for="beginChoiceDate">Date de début : </label> - <div class="col-lg-8"> + <label class="col-sm-4 control-label" for="beginChoiceDate">Date de début : </label> + <div class="col-sm-8"> <input class="form-control" type="text" id="beginChoiceDate" datepicker-popup="dd/MM/yyyy" min-date="data.poll.beginDate" @@ -94,8 +94,8 @@ </div> </div> <div class="form-group" ng-if="data.poll.choiceAddAllowed" for="endChoiceDate"> - <label class="col-lg-4 control-label">Date de fin : </label> - <div class="col-lg-8"> + <label class="col-sm-4 control-label">Date de fin : </label> + <div class="col-sm-8"> <input class="form-control" type="text" id="endChoiceDate" datepicker-popup="dd/MM/yyyy" min-date="data.poll.beginChoiceDate" @@ -108,15 +108,15 @@ </div> <div class="form-group"> - <label class="col-lg-4 control-label">Limiter les votes :</label> - <div class="col-lg-8 btn-group"> + <label class="col-sm-4 control-label">Limiter les votes :</label> + <div class="col-sm-8 btn-group"> <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="true">Oui</button> <button class="btn btn-default" ng-model="data.poll.limitedVote" btn-radio="false">Non</button> </div> </div> <div class="form-group" ng-show="data.poll.limitedVote"> - <label class="col-lg-4 control-label" for="popMaxChoiceNumber">Nombre de vote :</label> - <div class="col-lg-6"> + <label class="col-sm-4 control-label" for="popMaxChoiceNumber">Nombre de vote :</label> + <div class="col-sm-6"> <input type="text" class="form-control" id="popMaxChoiceNumber" ng-model="data.poll.maxChoiceNumber"/> </div> </div> @@ -124,8 +124,8 @@ <h4> Configuration des Réponses </h4> <div class="form-group"> - <label class="col-lg-4 control-label">Type : </label> - <div class="col-lg-8"> + <label class="col-sm-4 control-label">Type : </label> + <div class="col-sm-8"> <div class="btn-group"> <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="1">Normal</button> <button type="button" class="btn btn-success" ng-model="data.poll.voteCountingType" btn-radio="2">Pourcentage</button> @@ -140,8 +140,8 @@ </div> <div class="form-group"> - <label class="col-lg-4 control-label">Visibilité : </label> - <div class="col-lg-8 btn-group"> + <label class="col-sm-4 control-label">Visibilité : </label> + <div class="col-sm-8 btn-group"> <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'EVERYBODY'">Public</button> <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'VOTER'">Participants</button> <button type="button" class="btn btn-success" ng-model="data.poll.voteVisibility" btn-radio="'CREATOR'">Créateur</button> @@ -150,8 +150,8 @@ </div> <div class="form-group"> - <label class="col-lg-4 control-label">Autoriser les votes anonymes :</label> - <div class="col-lg-8 btn-group"> + <label class="col-sm-4 control-label">Autoriser les votes anonymes :</label> + <div class="col-sm-8 btn-group"> <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="true">Oui</button> <button class="btn btn-default" ng-model="data.poll.anonymousVoteAllowed" btn-radio="false">Non</button> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index c17df1a..d6403df 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -35,7 +35,7 @@ <div class="pollTitle" edit-me="showEditTitle"> <h1 ng-hide="showEditTitle"> {{data.poll.title || 'Click pour éditer'}} - <info-Error error="restError.title[0]" data="data.poll.title"></info-Error> + <info-error error="restError.title[0]" data="data.poll.title"></info-error> </h1> <h1 ng-show="showEditTitle"> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: update gitignore
by Chorem.org scm May 19, 2014

May 19, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 0568e4936219981f1aff8542f8353bafc0361b12 Author: Dralagen <dralagen(a)dralagen.fr> Date: Mon May 19 10:30:37 2014 +0200 update gitignore --- .gitignore | 5 ++++- pollen-ui-angular/pollen-ui-angular.iml | 16 ---------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index c62986e..2d3ae13 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ *.ipr *.iws *.iml -atlassian-ide-plugin.xml \ No newline at end of file +atlassian-ide-plugin.xml +target/* +*/target/* + diff --git a/pollen-ui-angular/pollen-ui-angular.iml b/pollen-ui-angular/pollen-ui-angular.iml deleted file mode 100644 index 3c5eaca..0000000 --- a/pollen-ui-angular/pollen-ui-angular.iml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: ignore idea files
by Chorem.org scm May 19, 2014

May 19, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit 930033cb11235fddb5d2a540599f9b63ed15b473 Author: tchemit <chemit(a)codelutin.com> Date: Mon May 19 09:29:56 2014 +0200 ignore idea files --- pollen-ui-angular/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pollen-ui-angular/.gitignore b/pollen-ui-angular/.gitignore new file mode 100644 index 0000000..797b705 --- /dev/null +++ b/pollen-ui-angular/.gitignore @@ -0,0 +1 @@ +*.iml \ 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

01/02: Revert "remove idea files from scm"
by Chorem.org scm May 19, 2014

May 19, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit 151624446d78bd8c21f83c0934e8da9b1c938d9e Author: tchemit <chemit(a)codelutin.com> Date: Mon May 19 09:07:02 2014 +0200 Revert "remove idea files from scm" This reverts commit ca4701841d393ceb800d7c3abc85038431054b8f. --- pollen-ui-angular/pollen-ui-angular.iml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/pollen-ui-angular/pollen-ui-angular.iml b/pollen-ui-angular/pollen-ui-angular.iml new file mode 100644 index 0000000..3c5eaca --- /dev/null +++ b/pollen-ui-angular/pollen-ui-angular.iml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: remove idea files from scm
by Chorem.org scm May 18, 2014

May 18, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit ca4701841d393ceb800d7c3abc85038431054b8f Author: tchemit <chemit(a)codelutin.com> Date: Sun May 18 17:41:02 2014 +0200 remove idea files from scm --- pollen-ui-angular/pollen-ui-angular.iml | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/pollen-ui-angular/pollen-ui-angular.iml b/pollen-ui-angular/pollen-ui-angular.iml deleted file mode 100644 index 3c5eaca..0000000 --- a/pollen-ui-angular/pollen-ui-angular.iml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add ignore files
by Chorem.org scm May 18, 2014

May 18, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit 75503f93ca31101ed889590d6ee09aa84c4ba827 Author: tchemit <chemit(a)codelutin.com> Date: Sun May 18 17:39:37 2014 +0200 add ignore files --- .gitignore | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c62986e --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.idea +*.ipr +*.iws +*.iml +atlassian-ide-plugin.xml \ 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

01/01: fixes #1029 Migrate to Git.
by Chorem.org scm May 18, 2014

May 18, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit 36b28b4805949b2e2f62e781708030b686feeeb4 Author: tchemit <chemit(a)codelutin.com> Date: Sun May 18 17:05:28 2014 +0200 fixes #1029 Migrate to Git. --- pom.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pom.xml b/pom.xml index b1d2760..f23caff 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ </modules> <scm> - <connection>scm:git:http://git.chorem.org/pollen.git</connection> + <connection>scm:git:https://git.chorem.org/pollen.git</connection> <developerConnection> scm:git:https://git.chorem.org/pollen.git </developerConnection> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0