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

r3852 - trunk
by tchemit＠users.chorem.org July 18, 2013

July 18, 2013

Author: tchemit Date: 2013-07-18 15:38:52 +0200 (Thu, 18 Jul 2013) New Revision: 3852 Url: http://chorem.org/projects/pollen/repository/revisions/3852 Log: Updates mavenpom to 3.4.13 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-11 15:26:28 UTC (rev 3851) +++ trunk/pom.xml 2013-07-18 13:38:52 UTC (rev 3852) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.12</version> + <version>3.4.13</version> </parent> <groupId>org.chorem</groupId>

1 0

r3851 - trunk
by tchemit＠users.chorem.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 17:26:28 +0200 (Thu, 11 Jul 2013) New Revision: 3851 Url: http://chorem.org/projects/pollen/repository/revisions/3851 Log: use eugene 2.6.4-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-06 10:58:10 UTC (rev 3850) +++ trunk/pom.xml 2013-07-11 15:26:28 UTC (rev 3851) @@ -162,7 +162,7 @@ <nuitonJpaVersion>1.0-SNAPSHOT</nuitonJpaVersion> <webmotionVersion>2.4-SNAPSHOT</webmotionVersion> - <eugenePluginVersion>2.6.3</eugenePluginVersion> + <eugenePluginVersion>2.6.4-SNAPSHOT</eugenePluginVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.13</nuitonWebVersion>

1 0

r3850 - in trunk: . pollen-rest-api pollen-rest-api/src/main/java/org/chorem/pollen/rest/api pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1 pollen-rest-api/src/main/resources pollen-rest-api/src/test/java/org/chorem/pollen/rest/api pollen-rest-api/src/test/resources
by tchemit＠users.chorem.org July 6, 2013

July 6, 2013

Author: tchemit Date: 2013-07-06 12:58:10 +0200 (Sat, 06 Jul 2013) New Revision: 3850 Url: http://chorem.org/projects/pollen/repository/revisions/3850 Log: - make first TU works on rest api - fix some rest api + mapping Modified: trunk/pollen-rest-api/pom.xml trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenApplicationContext.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListService.java trunk/pollen-rest-api/src/main/resources/mapping trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserServiceTest.java trunk/pollen-rest-api/src/test/resources/log4j.properties trunk/pom.xml Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pollen-rest-api/pom.xml 2013-07-06 10:58:10 UTC (rev 3850) @@ -77,6 +77,10 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>fluent-hc</artifactId> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> <dependency> <groupId>com.google.guava</groupId> Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenApplicationContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenApplicationContext.java 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenApplicationContext.java 2013-07-06 10:58:10 UTC (rev 3850) @@ -99,7 +99,7 @@ if (entityManagerFactory != null && entityManagerFactory.isOpen()) { if (log.isInfoEnabled()) { - log.info("stopping magalie, will close entity manager factory"); + log.info("stopping Pollen, will close entity manager factory"); } entityManagerFactory.close(); Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListService.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListService.java 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListService.java 2013-07-06 10:58:10 UTC (rev 3850) @@ -57,7 +57,7 @@ return context.getVoterListService().getVoterList(pollId, voterListId); } - public VoterList addVoterList(PollenServiceContext context, String pollId, VoterList voterList) throws EntityNotFoundException, InvalidVoterListFormException { + public VoterList createVoterList(PollenServiceContext context, String pollId, VoterList voterList) throws EntityNotFoundException, InvalidVoterListFormException { context.getSecurityService().prepareSubject(pollId); return context.getVoterListService().addVoterList(pollId, voterList); } Modified: trunk/pollen-rest-api/src/main/resources/mapping =================================================================== --- trunk/pollen-rest-api/src/main/resources/mapping 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pollen-rest-api/src/main/resources/mapping 2013-07-06 10:58:10 UTC (rev 3850) @@ -15,7 +15,14 @@ org.chorem.pollen.services.exception.EntityNotFoundException ErrorAction.on404 org.chorem.pollen.services.exception.UserInvalidPasswordException ErrorAction.on500 org.chorem.pollen.services.exception.UserInvalidEmailActivationTokenException ErrorAction.on500 -org.chorem.pollen.services.exception.AbstractInvalidFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidChoiceFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidPollenUserFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidFavoriteListFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidFavoriteListMemberFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidVoterListFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidVoterListMemberFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidVoteFormException ErrorAction.on500Form +org.chorem.pollen.services.exception.InvalidPollFormException ErrorAction.on500Form [actions] @@ -45,8 +52,8 @@ GET /v1/favoriteLists FavoriteListService.getFavoriteLists GET /v1/favoriteLists/{flId} FavoriteListService.getFavoriteList -POST /v1/favoriteLists/{flId}/importCsv FavoriteListService.importFavoriteListMemberFromCsv -POST /v1/favoriteLists/{flId}/importLdap FavoriteListService.importFavoriteListMemberFromLdap +POST /v1/favoriteLists/{flId}/importCsv FavoriteListService.importFavoriteListMembersFromCsv +POST /v1/favoriteLists/{flId}/importLdap FavoriteListService.importFavoriteListMembersFromLdap POST /v1/favoriteLists FavoriteListService.createFavoriteList PUT /v1/favoriteLists/{flId} FavoriteListService.editFavoriteList DELETE /v1/favoriteLists/{flId} FavoriteListService.deleteFavoriteList Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java 2013-07-06 10:58:10 UTC (rev 3850) @@ -24,9 +24,9 @@ */ import org.chorem.pollen.persistence.JpaPollenPersistenceContext; -import org.chorem.pollen.services.service.FixturesService; import org.chorem.pollen.services.PollenFixtures; import org.chorem.pollen.services.PollenServiceContext; +import org.chorem.pollen.services.service.FixturesService; import org.debux.webmotion.unittest.WebMotionJUnit; import org.junit.Rule; import org.nuiton.jpa.junit.JpaEntityManagerRule; @@ -52,11 +52,8 @@ if (applicationContext == null) { applicationContext = new PollenApplicationContext() { - @Override - public EntityManager newEntityManager() { - return getJpaEntityManagerRule().getEntityManager(); - } + @Override public PollenServiceContext newServiceContext(EntityManager entityManager) { @@ -92,7 +89,7 @@ protected PollenServiceContext getServiceContext() { - EntityManager entityManager = getJpaEntityManagerRule().getEntityManager(); + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); PollenServiceContext result = applicationContext.newServiceContext(entityManager); return result; Modified: trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserServiceTest.java =================================================================== --- trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserServiceTest.java 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/PollenUserServiceTest.java 2013-07-06 10:58:10 UTC (rev 3850) @@ -25,7 +25,6 @@ import org.apache.http.client.fluent.Request; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -36,7 +35,6 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.0 */ -@Ignore public class PollenUserServiceTest extends AbstractPollenRestApiTest { @@ -49,7 +47,7 @@ @Test public void testGetUsers() throws Exception { - Request request = createRequest("/users").Get(); + Request request = createRequest("/v1/users").Get(); String result = request.execute().returnContent().asString(); assertTrue(result.contains("email")); Modified: trunk/pollen-rest-api/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-rest-api/src/test/resources/log4j.properties 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pollen-rest-api/src/test/resources/log4j.properties 2013-07-06 10:58:10 UTC (rev 3850) @@ -20,13 +20,13 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -log4j.rootCategory=DEBUG, console +log4j.rootCategory=ERROR, console log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout log4j.appender.console.layout.ConversionPattern=%d{hh:mm:ss} %5p (%F:%L) %m%n log4j.logger.org.chorem.pollen=TRACE -log4j.logger.org.debux=TRACE +log4j.logger.org.debux=INFO # log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=FATAL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-05 17:21:56 UTC (rev 3849) +++ trunk/pom.xml 2013-07-06 10:58:10 UTC (rev 3850) @@ -162,7 +162,6 @@ <nuitonJpaVersion>1.0-SNAPSHOT</nuitonJpaVersion> <webmotionVersion>2.4-SNAPSHOT</webmotionVersion> -  <eugenePluginVersion>2.6.3</eugenePluginVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> @@ -170,17 +169,13 @@ <nuitonUtilsVersion>2.6.13-SNAPSHOT</nuitonUtilsVersion> <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> -  -  <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>9.0.3.v20130506</jettyVersion> -  -  <hibernateVersion>4.3.0.Beta3</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> - <httpCommonsHttpclientVersion>4.3-beta2</httpCommonsHttpclientVersion> + <httpCommonsHttpclientVersion>4.2.3</httpCommonsHttpclientVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>  @@ -423,6 +418,12 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${httpCommonsHttpclientVersion}</version> + </dependency> + + <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.2.4</version>

1 0

r3849 - trunk
by tchemit＠users.chorem.org July 5, 2013

July 5, 2013

Author: tchemit Date: 2013-07-05 19:21:56 +0200 (Fri, 05 Jul 2013) New Revision: 3849 Url: http://chorem.org/projects/pollen/repository/revisions/3849 Log: up mavenpom + nuiton-jpa version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 08:30:47 UTC (rev 3848) +++ trunk/pom.xml 2013-07-05 17:21:56 UTC (rev 3849) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.12-SNAPSHOT</version> + <version>3.4.12</version> </parent> <groupId>org.chorem</groupId> @@ -159,7 +159,7 @@ <projectId>pollen</projectId>  - <nuitonJpaVersion>0.1-SNAPSHOT</nuitonJpaVersion> + <nuitonJpaVersion>1.0-SNAPSHOT</nuitonJpaVersion> <webmotionVersion>2.4-SNAPSHOT</webmotionVersion>

1 0

r3848 - trunk
by tchemit＠users.chorem.org July 1, 2013

July 1, 2013

Author: tchemit Date: 2013-07-01 10:30:47 +0200 (Mon, 01 Jul 2013) New Revision: 3848 Url: http://chorem.org/projects/pollen/repository/revisions/3848 Log: up up up\! Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 06:58:49 UTC (rev 3847) +++ trunk/pom.xml 2013-07-01 08:30:47 UTC (rev 3848) @@ -180,6 +180,7 @@ <hibernateVersion>4.3.0.Beta3</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> + <httpCommonsHttpclientVersion>4.3-beta2</httpCommonsHttpclientVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>

1 0

r3847 - trunk
by tchemit＠users.chorem.org July 1, 2013

July 1, 2013

Author: tchemit Date: 2013-07-01 08:58:49 +0200 (Mon, 01 Jul 2013) New Revision: 3847 Url: http://chorem.org/projects/pollen/repository/revisions/3847 Log: up up up\! Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 06:54:32 UTC (rev 3846) +++ trunk/pom.xml 2013-07-01 06:58:49 UTC (rev 3847) @@ -177,7 +177,7 @@ <jettyVersion>9.0.3.v20130506</jettyVersion>   - <hibernateVersion>4.3.0.Beta2</hibernateVersion> + <hibernateVersion>4.3.0.Beta3</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> @@ -403,12 +403,6 @@  <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.7</version> - </dependency> - - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.5.0-b01</version> @@ -430,7 +424,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2</version> + <version>2.2.4</version> </dependency> <dependency>

1 0

Jenkins build became unstable: pollen » Pollen :: Service #1364
by admin+hudson＠codelutin.com July 1, 2013

July 1, 2013

See <http://ci.nuiton.org/jenkins/job/pollen/org.chorem.pollen$pollen-services/1…>

1 4

Jenkins build became unstable: pollen #1364
by admin+hudson＠codelutin.com July 1, 2013

July 1, 2013

See <http://ci.nuiton.org/jenkins/job/pollen/1364/>

1 4

r3846 - trunk
by tchemit＠users.chorem.org July 1, 2013

July 1, 2013

Author: tchemit Date: 2013-07-01 08:54:32 +0200 (Mon, 01 Jul 2013) New Revision: 3846 Url: http://chorem.org/projects/pollen/repository/revisions/3846 Log: up up up\! Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) +++ trunk/pom.xml 2013-07-01 06:54:32 UTC (rev 3846) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>3.4.12-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -177,7 +177,7 @@ <jettyVersion>9.0.3.v20130506</jettyVersion>   - <hibernateVersion>4.3.0.Beta1</hibernateVersion> + <hibernateVersion>4.3.0.Beta2</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> @@ -430,7 +430,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.1</version> + <version>2.2</version> </dependency> <dependency>

1 0

r3845 - in trunk: . pollen-persistence pollen-rest-api pollen-services
by tchemit＠users.chorem.org July 1, 2013

July 1, 2013

Author: tchemit Date: 2013-07-01 08:44:16 +0200 (Mon, 01 Jul 2013) New Revision: 3845 Url: http://chorem.org/projects/pollen/repository/revisions/3845 Log: fix deps after upgrade of hibernate Modified: trunk/pollen-persistence/pom.xml trunk/pollen-rest-api/pom.xml trunk/pollen-services/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pollen-persistence/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -29,14 +29,14 @@ <artifactId>guava</artifactId> </dependency> - <dependency> +  +  <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -66,17 +66,22 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> +  + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> - <dependency> +  <dependency> <groupId>junit</groupId> Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pollen-rest-api/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -43,9 +43,14 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> +  + <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pollen-services/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -24,9 +24,14 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <artifactId>hibernate-jpa-2.1-api</artifactId> </dependency> +  + <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-persistence</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) +++ trunk/pom.xml 2013-07-01 06:44:16 UTC (rev 3845) @@ -232,8 +232,8 @@ <dependency> <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>1.0.1.Final</version> + <artifactId>hibernate-jpa-2.1-api</artifactId> + <version>1.0.0.Draft-16</version> </dependency> <dependency> @@ -254,6 +254,12 @@ <groupId>org.nuiton.jpa</groupId> <artifactId>nuiton-jpa-api</artifactId> <version>${nuitonJpaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0