Author: tchemit Date: 2013-07-01 08:33:05 +0200 (Mon, 01 Jul 2013) New Revision: 3844 Url: http://chorem.org/projects/pollen/repository/revisions/3844 Log: up some libs + optimize dependencies Modified: trunk/pollen-rest-api/pom.xml trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java trunk/pom.xml Modified: trunk/pollen-rest-api/pom.xml =================================================================== --- trunk/pollen-rest-api/pom.xml 2013-07-01 06:12:00 UTC (rev 3843) +++ trunk/pollen-rest-api/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) @@ -52,53 +52,39 @@ </dependency> <dependency> - <groupId>com.esotericsoftware.yamlbeans</groupId> - <artifactId>yamlbeans</artifactId> - </dependency> - - <dependency> <groupId>javax</groupId> <artifactId>javaee-api</artifactId> </dependency> - <!--dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency--> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>fluent-hc</artifactId> </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> </dependency> + <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> </dependency> <dependency> @@ -108,17 +94,17 @@ <dependency> <groupId>org.nuiton.jpa</groupId> - <artifactId>nuiton-jpa-junit</artifactId> + <artifactId>nuiton-jpa-api</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> + <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-junit</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>nuiton-utils</artifactId> </dependency> <dependency> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2013-07-01 06:12:00 UTC (rev 3843) +++ trunk/pollen-services/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) @@ -60,23 +60,23 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - </dependency> + </dependency--> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - </dependency> - <dependency> + </dependency--> + <!--dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> - </dependency> + </dependency--> <dependency> <groupId>junit</groupId> @@ -84,7 +84,17 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-api</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.jpa</groupId> <artifactId>nuiton-jpa-junit</artifactId> </dependency> Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java 2013-07-01 06:12:00 UTC (rev 3843) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java 2013-07-01 06:33:05 UTC (rev 3844) @@ -24,6 +24,8 @@ */ import com.google.common.base.Preconditions; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.pollen.persistence.dao.PollenUserJpaDao; import org.chorem.pollen.persistence.dao.SessionTokenJpaDao; import org.chorem.pollen.persistence.entity.PollenUser; @@ -40,6 +42,9 @@ */ public class AuthService extends AbstractPollenService { + /** Logger. */ + private static final Log log = LogFactory.getLog(AuthService.class); + public SessionToken login(String login, String password) throws EntityNotFoundException, UserInvalidPasswordException { Preconditions.checkNotNull(login); Preconditions.checkNotNull(password); @@ -82,6 +87,9 @@ getPersistenceContext().commit(); //TODO Notifiy Password changed + if (log.isDebugEnabled()) { + log.debug("Notify Password Changed"); + } } public void logout(String login, String token) throws EntityNotFoundException { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 06:12:00 UTC (rev 3843) +++ trunk/pom.xml 2013-07-01 06:33:05 UTC (rev 3844) @@ -176,7 +176,8 @@ <slf4jVersion>1.7.5</slf4jVersion> <jettyVersion>9.0.3.v20130506</jettyVersion> <!--jettyVersion>${jettyPluginVersion}</jettyVersion--> - <hibernateVersion>4.2.2.Final</hibernateVersion> + <!--<hibernateVersion>4.2.2.Final</hibernateVersion>--> + <hibernateVersion>4.3.0.Beta1</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> <mockitoVersion>1.9.5</mockitoVersion> @@ -398,13 +399,13 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.6</version> + <version>1.7</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4.7</version> + <version>1.5.0-b01</version> </dependency> <dependency> @@ -415,9 +416,21 @@ </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>fluent-hc</artifactId> + <version>${httpCommonsHttpclientVersion}</version> + </dependency> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.1</version> + </dependency> + + <dependency> <groupId>javax</groupId> <artifactId>javaee-api</artifactId> - <version>6.0</version> + <version>7.0</version> <scope>provided</scope> </dependency> @@ -429,6 +442,13 @@ </dependency> <dependency> + <groupId>org.apache.tomcat.embed</groupId> + <artifactId>tomcat-embed-core</artifactId> + <version>7.0.41</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> <version>1.1.1</version>