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

r3273 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:56:05 +0200 (Fri, 13 Apr 2012) New Revision: 3273 Url: http://chorem.org/repositories/revision/pollen/3273 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-services/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -524,9 +524,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3-rc1</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3272 - in tags: . pollen-1.3-rc1
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:56:03 +0200 (Fri, 13 Apr 2012) New Revision: 3272 Url: http://chorem.org/repositories/revision/pollen/3272 Log: [maven-release-plugin] copy for tag pollen-1.3-rc1 Added: tags/pollen-1.3-rc1/ Property changes on: tags/pollen-1.3-rc1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3271 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:56:00 +0200 (Fri, 13 Apr 2012) New Revision: 3271 Url: http://chorem.org/repositories/revision/pollen/3271 Log: [maven-release-plugin] prepare release pollen-1.3-rc1 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,7 +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"> +<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> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-services/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,7 +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"> +<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> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,7 +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"> +<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> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,14 +1,12 @@ <?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"> +<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> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,7 +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"> +<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> @@ -17,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> <modules> <module>pollen-votecounting</module> @@ -526,9 +524,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3-rc1</url> </scm> <distributionManagement> @@ -617,7 +615,7 @@ <profiles> <profile> - <id>extra-modules</id> + <id>extra-modulesA</id> <modules> <module>pollen-domain</module>

1 0

r3270 - in trunk: pollen-persistence pollen-persistence/src/license pollen-services/src/license pollen-ui-struts2 pollen-ui-struts2/src/license pollen-votecounting pollen-votecounting/src/license
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:49:44 +0200 (Fri, 13 Apr 2012) New Revision: 3270 Url: http://chorem.org/repositories/revision/pollen/3270 Log: optimize dependencies + update third-parties Removed: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/license/THIRD-PARTY.properties trunk/pollen-services/src/license/THIRD-PARTY.properties trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties trunk/pollen-votecounting/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -42,10 +42,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> +  <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -55,6 +55,10 @@ <artifactId>topia-service-migration</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -11,6 +11,8 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -18,10 +20,8 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:31:24 CET 2012 +#Fri Apr 13 19:35:55 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 Modified: trunk/pollen-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -13,6 +13,8 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -20,10 +22,10 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:32:21 CET 2012 +#Fri Apr 13 19:36:08 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 +jdom--jdom--1.0=The Apache Software License, Version 2.0 +rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -19,11 +19,11 @@ <artifactId>pollen-ui-struts2</artifactId> <dependencies> -  + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-persistence</artifactId> @@ -116,6 +116,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-jfreechart-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -133,6 +134,32 @@ <artifactId>shiro-web</artifactId> </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> +  <dependency> <groupId>javax.servlet</groupId> Modified: trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -4,17 +4,21 @@ # - Apache Software License - Version 2.0 # - BSD License # - BSD-style license +# - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Affero General Public License version 3 +# - GNU Lesser General Public Licence # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDOM Apache-like license # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Mozilla Public License +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -23,12 +27,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:33:46 CET 2012 +#Fri Apr 13 19:37:43 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 +jdom--jdom--1.0=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 +rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -31,10 +31,10 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> +  <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> Deleted: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-votecounting/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-votecounting/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -1,19 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - BSD License -# - BSD style -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - MIT License -# - The Apache Software License, Version 2.0 -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Mon Jan 30 01:22:54 CET 2012 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0

1 0

r3269 - in trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: admin user
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 19:46:37 +0200 (Fri, 13 Apr 2012) New Revision: 3269 Url: http://chorem.org/repositories/revision/pollen/3269 Log: use commons-lang3 only Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 17:43:16 UTC (rev 3268) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 17:46:37 UTC (rev 3269) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.ui.actions.admin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.impl.PollService; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 17:43:16 UTC (rev 3268) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 17:46:37 UTC (rev 3269) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.ui.actions.user; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.PersonList; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.services.impl.FavoriteService; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-13 17:43:16 UTC (rev 3268) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-13 17:46:37 UTC (rev 3269) @@ -1,6 +1,6 @@ package org.chorem.pollen.ui.actions.user; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.services.exceptions.UserNotFoundException; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.ui.actions.PollenActionSupport;

1 0

r3268 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 19:43:16 +0200 (Fri, 13 Apr 2012) New Revision: 3268 Url: http://chorem.org/repositories/revision/pollen/3268 Log: remove useless logger Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java 2012-04-13 17:27:48 UTC (rev 3267) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java 2012-04-13 17:43:16 UTC (rev 3268) @@ -24,8 +24,6 @@ package org.chorem.pollen.ui.actions; import org.apache.struts2.util.StrutsTypeConverter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.Map; @@ -33,12 +31,9 @@ * Created: 26/03/12 * * @author fdesbois <desbois(a)codelutin.com> - * $Id$ */ public class BooleanIntegerConverter extends StrutsTypeConverter { - private static final Logger log = LoggerFactory.getLogger(BooleanIntegerConverter.class); - @Override public Integer convertFromString(Map context, String[] values, Class toClass) { Integer result;

1 0

r3267 - in trunk: . pollen-business pollen-domain pollen-persistence pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-services pollen-services/src/main/java/org/chorem/pollen/bean pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-ui pollen-ui-struts2 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user pollen-ui-struts2/src/main/resources/template/themes pollen-ui
by tchemit＠users.chorem.org April 13, 2012

April 13, 2012

Author: tchemit Date: 2012-04-13 19:27:48 +0200 (Fri, 13 Apr 2012) New Revision: 3267 Url: http://chorem.org/repositories/revision/pollen/3267 Log: - change versions - add svn properties - add headers - use fluido maven skin Added: trunk/src/site/resources/maven-site-chorem.org.js Modified: trunk/pollen-business/pom.xml trunk/pollen-domain/pom.xml trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/resources/template/themes/README.txt trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-business/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-domain/pom.xml =================================================================== --- trunk/pollen-domain/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-domain/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-services/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-04-13 17:27:48 UTC (rev 3267) @@ -2,8 +2,8 @@ #%L Pollen :: UI (strust2) - $Id: VotingList.jsp 3247 2012-04-11 14:23:26Z fdesbois $ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2/pollen-ui-st… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -17,7 +17,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -147,14 +147,14 @@ </dependency> <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <version>${shiroVersion}</version> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + <version>${shiroVersion}</version> </dependency> <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - <version>${shiroVersion}</version> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + <version>${shiroVersion}</version> </dependency> @@ -460,13 +460,15 @@ <shiroVersion>1.2.0</shiroVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - +  <siteLocales>en,fr</siteLocales>  <license.licenseName>agpl_v3</license.licenseName> + <scmwebeditorEnabled>true</scmwebeditorEnabled> + </properties> <build> @@ -524,15 +526,9 @@  <scm> - <connection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 - </connection> - <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 - </developerConnection> - <url> - http://www.chorem.org/repositories/browse/pollen/branches/pollen-1.2.6-stru… - </url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement> @@ -544,29 +540,12 @@ <repositories> -  -  - -  -  -  <repository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -581,7 +560,7 @@ <repository> <id>nuiton.snapshot</id> <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> @@ -601,7 +580,7 @@ <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -616,7 +595,7 @@ <pluginRepository> <id>nuiton.snapshot</id> <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> @@ -635,4 +614,17 @@ </reporting> + <profiles> + + <profile> + <id>extra-modules</id> + + <modules> + <module>pollen-domain</module> + <module>pollen-business</module> + <module>pollen-ui</module> + </modules> + </profile> + </profiles> + </project> Added: trunk/src/site/resources/maven-site-chorem.org.js =================================================================== --- trunk/src/site/resources/maven-site-chorem.org.js (rev 0) +++ trunk/src/site/resources/maven-site-chorem.org.js 2012-04-13 17:27:48 UTC (rev 3267) @@ -0,0 +1,82 @@ +/* + * #%L + * EchoBase + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, 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% + */ +$(document).ready(function () { + + var metas = $('#projectMetas'); + var piwikEnabled = metas.attr('piwikEnabled'); + if (piwikEnabled) { + //Piwik Tracking Code + var piwikId = metas.attr('piwikId'); + if (!piwikId) { + + // default piwikId for chorem.org + piwikId = 3; + } + + console.log("use Piwik with id = " + piwikId); + var pkBaseURL = "https:" == document.location.protocol ? + "https://piwik.codelutin.com/" : + "http://piwik.codelutin.com/"; + $.getScript(pkBaseURL + "piwik.js", function (data, textStatus, jqxhr) { + var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", piwikId); + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); + console.log("piwikTracker loaded = " + piwikTracker); + }); + //Piwik Tracking Code + } + var scmwebeditorenabled = metas.attr('scmwebeditorenabled'); + var scm = metas.attr('scm'); + if (scmwebeditorenabled && scm.indexOf("/trunk") > -1) { + + // allow scmwebeditor is enabled and on trunk + + var scmurl = metas.attr('scmwebeditorurl'); + var projectId = metas.attr('projectId'); + var siteSourcesType = metas.attr('siteSourcesType'); + var path; + var pathname = document.location.pathname; + if (pathname.indexOf('target/site') > 0) { + path = pathname.substr(pathname.indexOf('/site')). + replace('/site/', ''); + } else { + if (pathname == '/' + projectId + '/') { + // on / page + path = 'index.html'; + } else { + path = pathname.substr(pathname.indexOf('/' + projectId)). + replace('/' + projectId + '/', ''); + } + } + path = path.replace('.html', '.' + siteSourcesType); + var url = scmurl + "?address=" + scm + "/src/site/" + siteSourcesType + "/" + path; + console.log("Add scmwebeditor with url = " + url); + var html = "<li class='pull-right'><a href='" + url + + "'>Éditer la page</a></li>" + + "<li class='divider pull-right'>|</li>"; + var ul = $('#publishDate'); + ul.prepend(html); + + } +}); \ No newline at end of file Property changes on: trunk/src/site/resources/maven-site-chorem.org.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/src/site/site_en.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -25,8 +25,6 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -37,6 +35,35 @@ <href>http://www.codelutin.com</href> </bannerRight> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> @@ -94,7 +121,24 @@  <menu ref="reports"/> + <footer> + <script type="text/javascript" src="./maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> - -</project> + </project> + Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/src/site/site_fr.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -25,8 +25,6 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -37,6 +35,25 @@ <href>http://www.codelutin.com</href> </bannerRight> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> @@ -92,6 +109,24 @@  <menu ref="reports"/> + <footer> + + <script type="text/javascript" src="./maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>

1 0

r3266 - trunk
by tchemit＠users.chorem.org April 13, 2012

April 13, 2012

Author: tchemit Date: 2012-04-13 18:52:34 +0200 (Fri, 13 Apr 2012) New Revision: 3266 Url: http://chorem.org/repositories/revision/pollen/3266 Log: updates to mavenpom 3.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 16:33:50 UTC (rev 3265) +++ trunk/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2.1-SNAPSHOT</version> + <version>3.2.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r3265 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration
by tchemit＠users.chorem.org April 13, 2012

April 13, 2012

Author: tchemit Date: 2012-04-13 18:33:50 +0200 (Fri, 13 Apr 2012) New Revision: 3265 Url: http://chorem.org/repositories/revision/pollen/3265 Log: fix migration script for pg Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 16:27:58 UTC (rev 3264) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 16:33:50 UTC (rev 3265) @@ -91,7 +91,7 @@ queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); - queries.add("UPDATE comment AS c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); + queries.add("UPDATE comment AS c SET author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); queries.add("ALTER TABLE comment ALTER COLUMN author TYPE VARCHAR(255);"); queries.add("UPDATE comment SET author = 'anonymous' WHERE author IS NULL;");

1 0

r3264 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration
by tchemit＠users.chorem.org April 13, 2012

April 13, 2012

Author: tchemit Date: 2012-04-13 18:27:58 +0200 (Fri, 13 Apr 2012) New Revision: 3264 Url: http://chorem.org/repositories/revision/pollen/3264 Log: fix migration script for postgres Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 15:48:45 UTC (rev 3263) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-04-13 16:27:58 UTC (rev 3264) @@ -91,9 +91,11 @@ queries.add("ALTER TABLE comment ADD COLUMN author VARCHAR(255);"); - queries.add("UPDATE comment c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); + queries.add("UPDATE comment AS c SET c.author = (SELECT p.votingId FROM pollAccount p WHERE c.pollAccount = p.topiaId);"); - queries.add("ALTER TABLE comment ALTER COLUMN author VARCHAR(255) NOT NULL;"); + queries.add("ALTER TABLE comment ALTER COLUMN author TYPE VARCHAR(255);"); + queries.add("UPDATE comment SET author = 'anonymous' WHERE author IS NULL;"); + queries.add("ALTER TABLE comment ALTER COLUMN author SET NOT NULL;"); } private void addForeignKeyIndexes(List<String> queries) {

1 0