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

r3688 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 19:49:33 +0200 (Wed, 05 Sep 2012) New Revision: 3688 Url: http://chorem.org/repositories/revision/pollen/3688 Log: refs #804: Can not acces no more to poll where I was admin and voter (for the moment warn when finding more than one voter for a poll...) Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-09-05 17:48:19 UTC (rev 3687) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-09-05 17:49:33 UTC (rev 3688) @@ -24,7 +24,10 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; @@ -32,6 +35,9 @@ public class PollAccountDAOImpl<E extends PollAccount> extends PollAccountDAOAbstract<E> { + /** Logger. */ + private static final Log log = LogFactory.getLog(PollAccountDAOImpl.class); + /** * Get a restricted poll account for a given poll (by his {@link Poll#getPollId()}) * using the {@link PollAccount#getAccountId()} of the pollAccount @@ -143,7 +149,21 @@ hql += "e.userAccount = :user"; } - E result = findByQuery(hql, params.toArray()); + List<E> allVoter = findAllByQuery(hql, params.toArray()); + E result = null; + if (CollectionUtils.isNotEmpty(allVoter)) { + if (allVoter.size() > 1) { + if (log.isWarnEnabled()) { + log.warn("Multiple voter found for poll " + pollId); + for (E e : allVoter) { + if (log.isWarnEnabled()) { + log.warn("accountId: " + e.getAccountId()); + } + } + } + } + result = allVoter.get(0); + } return result; } @@ -156,12 +176,6 @@ int records = favoriteList.sizePollAccount(); pager.setRecords(records); -// TopiaQuery query = createQuery("e"); -// TopiaFilterPagerUtil.addPagerToQuery(query, pager); -// query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, favoriteList); -// -// List<E> result = findAllByQuery(query); - String hql = "FROM PollAccountImpl e WHERE e.personList = :owner"; List<E> result = findAllByQueryAndPager(hql, pager, "owner", favoriteList); @@ -174,21 +188,6 @@ Preconditions.checkNotNull(personListToUpdate); Preconditions.checkNotNull(pollAccount); -// // check there is other poll account in this list with same id -// TopiaQuery query = createQuery("e"); -// query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate); -// query.addWhere("e." + PollAccount.PROPERTY_EMAIL, TopiaQuery.Op.EQ, pollAccount.getEmail()); -// -// String pollAccountId = pollAccount.getTopiaId(); -// if (pollAccountId == null) { -// // no check necessary, it's a new pollAccount -// -// } else { -// query.addWhere("e." + PollAccount.TOPIA_ID, TopiaQuery.Op.NEQ, pollAccountId); -// } -// -// boolean result = existByQuery(query); - String hql = "FROM PollAccountImpl e WHERE " + "e.personList = :person AND " + "e.email = :email";

1 0

r3687 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 19:48:19 +0200 (Wed, 05 Sep 2012) New Revision: 3687 Url: http://chorem.org/repositories/revision/pollen/3687 Log: pass to version 1.4.5.2 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-persistence/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-services/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) +++ trunk/pom.xml 2012-09-05 17:48:19 UTC (rev 3687) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.2-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module>

1 0

r3686 - in branches/pollen-1.5-SOCIAL: . pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/xmi pollen-services pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social pollen-ui-struts2/src/main/resources/config
by sletellier＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: sletellier Date: 2012-09-05 18:01:25 +0200 (Wed, 05 Sep 2012) New Revision: 3686 Url: http://chorem.org/repositories/revision/pollen/3686 Log: Init facebook and twitter registration Added: branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/ branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/FacebookCallback.java branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithFacebook.java branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithTwitter.java branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/TwitterCallback.java Modified: branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/xmi/pollen.zargo branches/pollen-1.5-SOCIAL/pollen-services/pom.xml branches/pollen-1.5-SOCIAL/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/resources/config/struts-user.xml branches/pollen-1.5-SOCIAL/pom.xml Modified: branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-09-05 16:00:45 UTC (rev 3685) +++ branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -213,6 +213,34 @@ return result; } + public String getTwitterConsumerKey() { + return applicationConfig.getOption(PollenConfigurationOption.TWITTER_CONSUMER_KEY.key); + } + + public String getTwitterConsumerSecret() { + return applicationConfig.getOption(PollenConfigurationOption.TWITTER_CONSUMER_SECRET.key); + } + + public String getFacebookScope() { + return applicationConfig.getOption(PollenConfigurationOption.FACEBOOK_SCOPE.key); + } + + public String getFacebookSecret() { + return applicationConfig.getOption(PollenConfigurationOption.FACEBOOK_SECRET.key); + } + + public String getFacebookApplicationId() { + return applicationConfig.getOption(PollenConfigurationOption.FACEBOOK_APPLICATION_ID.key); + } + + public String getFacebookCallBackURL() { + return applicationConfig.getOption(PollenConfigurationOption.FACEBOOK_CALLBACK_URL.key); + } + + public String getTwitterCallBackURL() { + return applicationConfig.getOption(PollenConfigurationOption.TWITTER_CALLBACK_URL.key); + } + public String getCharset() { String result = applicationConfig.getOption( PollenConfigurationOption.CHARSET.key); Modified: branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-09-05 16:00:45 UTC (rev 3685) +++ branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -123,8 +123,20 @@ DB_LOGIN("hibernate.connection.username", n_("pollen.configuration.dbLogin"), "sa", String.class), /** passowrd to db. */ - DB_PASSWORD("hibernate.connection.password", n_("pollen.configuration.dbPassword"), "", String.class); + DB_PASSWORD("hibernate.connection.password", n_("pollen.configuration.dbPassword"), "", String.class), + + // Social networks: Twitter + TWITTER_CONSUMER_KEY("pollen.social.twitter.consumer.key", "consumer key for twitter", null, String.class), + TWITTER_CONSUMER_SECRET("pollen.social.twitter.consumer.secret", "Secret consumer key for twitter", null, String.class), + TWITTER_CALLBACK_URL("pollen.social.twitter.callback.url", "Call back url for twitter", null, String.class), + + // Social networks: Facebook + FACEBOOK_SCOPE("pollen.social.facebook.scope", "Scope for facebook", null, String.class), + FACEBOOK_SECRET("pollen.social.facebook.secret", "Secret for facebook", null, String.class), + FACEBOOK_APPLICATION_ID("pollen.social.facebook.application.id", "Application id for facebook", null, String.class), + FACEBOOK_CALLBACK_URL("pollen.social.facebook.callback.url", "Call back url for facebook", null, String.class); + /** Configuration key. */ protected final String key; Modified: branches/pollen-1.5-SOCIAL/pollen-persistence/src/main/xmi/pollen.zargo =================================================================== (Binary files differ) Modified: branches/pollen-1.5-SOCIAL/pollen-services/pom.xml =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-services/pom.xml 2012-09-05 16:00:45 UTC (rev 3685) +++ branches/pollen-1.5-SOCIAL/pollen-services/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) @@ -104,6 +104,23 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + +  + <dependency> + <groupId>org.springframework.social</groupId> + <artifactId>spring-social-core</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework.social</groupId> + <artifactId>spring-social-facebook</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework.social</groupId> + <artifactId>spring-social-twitter</artifactId> + </dependency> + </dependencies>  Modified: branches/pollen-1.5-SOCIAL/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-09-05 16:00:45 UTC (rev 3685) +++ branches/pollen-1.5-SOCIAL/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -23,14 +23,21 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; +import java.util.List; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.TwitterCredentials; +import org.chorem.pollen.business.persistence.TwitterCredentialsDAO; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.UserAccountDAO; +import org.chorem.pollen.common.FacebookCredentials; +import org.chorem.pollen.common.FacebookCredentialsDAO; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.InvalidEmailException; @@ -43,9 +50,21 @@ import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.util.StringUtil; import org.nuiton.util.beans.Binder; +import org.springframework.social.connect.Connection; +import org.springframework.social.connect.UserProfile; +import org.springframework.social.facebook.api.Facebook; +import org.springframework.social.facebook.connect.FacebookConnectionFactory; +import org.springframework.social.oauth1.AuthorizedRequestToken; +import org.springframework.social.oauth1.OAuth1Operations; +import org.springframework.social.oauth1.OAuth1Parameters; +import org.springframework.social.oauth1.OAuthToken; +import org.springframework.social.oauth2.AccessGrant; +import org.springframework.social.oauth2.GrantType; +import org.springframework.social.oauth2.OAuth2Operations; +import org.springframework.social.oauth2.OAuth2Parameters; +import org.springframework.social.twitter.api.Twitter; +import org.springframework.social.twitter.connect.TwitterConnectionFactory; -import java.util.List; - import static org.nuiton.i18n.I18n._; public class UserService extends PollenServiceSupport { @@ -79,6 +98,168 @@ } } + public ImmutablePair<OAuthToken, String> connectWithTwitter() { + + PollenConfiguration config = getConfiguration(); + + TwitterConnectionFactory connectionFactory = + new TwitterConnectionFactory(config.getTwitterConsumerKey(), config.getTwitterConsumerSecret()); + + OAuth1Operations oauthOperations = connectionFactory.getOAuthOperations(); + OAuthToken requestToken = oauthOperations.fetchRequestToken(config.getTwitterCallBackURL(), null); + + String authorizeUrl = oauthOperations.buildAuthorizeUrl(requestToken.getValue(), OAuth1Parameters.NONE); + + return ImmutablePair.of(requestToken, authorizeUrl); + } + + public String connectWithFacebook() { + + PollenConfiguration config = getConfiguration(); + + FacebookConnectionFactory connectionFactory = + new FacebookConnectionFactory(config.getFacebookApplicationId(), config.getFacebookSecret()); + + OAuth2Operations oauthOperations = connectionFactory.getOAuthOperations(); + OAuth2Parameters params = new OAuth2Parameters(); + params.setRedirectUri(config.getFacebookCallBackURL()); + params.setScope(config.getFacebookScope()); + String authorizeUrl = oauthOperations.buildAuthorizeUrl(GrantType.AUTHORIZATION_CODE, params); + + return authorizeUrl; + } + + public UserAccount twitterCallBack(OAuthToken twitterRequestToken, String oauthVerifier) { + + PollenConfiguration config = getConfiguration(); + + TwitterConnectionFactory connectionFactory = + new TwitterConnectionFactory(config.getTwitterConsumerKey(), config.getTwitterConsumerSecret()); + + OAuth1Operations oauthOperations = connectionFactory.getOAuthOperations(); + + OAuthToken accessToken = oauthOperations.exchangeForAccessToken( + new AuthorizedRequestToken(twitterRequestToken, oauthVerifier), null); + + String twitterAccessTokenValue = accessToken.getValue(); + String twitterAccessTokenSecret = accessToken.getSecret(); + + // get twitter connection + Connection<Twitter> twitterConnection = getTwitterConnection(twitterAccessTokenValue, twitterAccessTokenSecret); + + // get user if exist + long twitterId = twitterConnection.getApi().userOperations().getUserProfile().getId(); + + UserAccountDAO userAccountDAO = getDAO(UserAccount.class); + TwitterCredentialsDAO twitterCredentialsDAO = getDAO(TwitterCredentials.class); + try { + + // account found +// UserAccount account = userAccountDAO.findByTwitterId(twitterId) + UserAccount account = null; + + if (account == null) { + account = userAccountDAO.create(); + } + + // convert profile to pollen account + account = updateAccountWithSocialProfile(account, twitterConnection.fetchUserProfile()); + + // create twitter credentials + TwitterCredentials twitterCredentials = twitterCredentialsDAO.create( + TwitterCredentials.PROPERTY_TWITTER_ID, twitterId, + TwitterCredentials.PROPERTY_TWITTER_ACCESS_TOKEN, twitterAccessTokenValue, + TwitterCredentials.PROPERTY_TWITTER_ACCESS_TOKEN_SECRET, twitterAccessTokenSecret); + + account.setTwitterCredentials(twitterCredentials); + + return account; + } catch (TopiaException eee) { + throw new PollenTechnicalException(eee); + } + } + + public UserAccount facebookCallBack(String facebookCode) { + + // get facebook connection + Connection<Facebook> facebookConnection = getFacebookConnection(facebookCode); + + String facebookId = facebookConnection.getApi().userOperations().getUserProfile().getId(); + + UserAccountDAO userAccountDAO = getDAO(UserAccount.class); + FacebookCredentialsDAO facebookCredentialsDAO = getDAO(FacebookCredentials.class); + try { + + // account found +// UserAccount account = userAccountDAO.findByFacebookId(twitterId) + UserAccount account = null; + + if (account == null) { + account = userAccountDAO.create(); + } + + // convert profile to pollen account + account = updateAccountWithSocialProfile(account, facebookConnection.fetchUserProfile()); + + // create facebook credentials + FacebookCredentials facebookCredentials = facebookCredentialsDAO.create( + FacebookCredentials.PROPERTY_FACEBOOK_ID, facebookId, + FacebookCredentials.PROPERTY_FACEBOOK_CODE, facebookCode); + + account.setFacebookCredentials(facebookCredentials); + + return account; + } catch (TopiaException eee) { + throw new PollenTechnicalException(eee); + } + } + + protected Connection<Twitter> getTwitterConnection(UserAccount account) { + TwitterCredentials twitterCredentials = account.getTwitterCredentials(); + return getTwitterConnection(twitterCredentials.getTwitterAccessToken(), twitterCredentials.getTwitterAccessTokenSecret()); + } + + protected Connection<Twitter> getTwitterConnection(String twitterAccessTokenValue, String twitterAccessTokenSecret) { + + PollenConfiguration config = getConfiguration(); + + TwitterConnectionFactory connectionFactory = + new TwitterConnectionFactory(config.getTwitterConsumerKey(), config.getTwitterConsumerSecret()); + + // retrieve access token + OAuthToken userAccessToken = new OAuthToken(twitterAccessTokenValue, twitterAccessTokenSecret); + Connection<Twitter> twitterConnection = connectionFactory.createConnection(userAccessToken); + + return twitterConnection; + } + + protected Connection<Facebook> getFacebookConnection(UserAccount account) { + return getFacebookConnection(account.getFacebookCredentials().getFacebookCode()); + } + + protected Connection<Facebook> getFacebookConnection(String facebookCode) { + + PollenConfiguration config = getConfiguration(); + + // get facebook connection + FacebookConnectionFactory connectionFactory = + new FacebookConnectionFactory(config.getFacebookApplicationId(), config.getFacebookSecret()); + + OAuth2Operations oauthOperations = connectionFactory.getOAuthOperations(); + AccessGrant accessGrant = oauthOperations.exchangeForAccess(facebookCode, config.getFacebookCallBackURL(), null); + Connection<Facebook> facebookConnection = connectionFactory.createConnection(accessGrant); + + return facebookConnection; + } + + protected UserAccount updateAccountWithSocialProfile(UserAccount account, UserProfile userProfile) { + account.setEmail(userProfile.getEmail()); + account.setFirstName(userProfile.getFirstName()); + account.setLastName(userProfile.getLastName()); + + return account; + } + public UserAccount createUser(UserAccount user, boolean byAdmin) throws UserLoginAlreadyUsedException, UserEmailAlreadyUsedException { @@ -343,5 +524,4 @@ destination.setEmail(StringUtils.lowerCase(source.getEmail())); } } - } Modified: branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-09-05 16:00:45 UTC (rev 3685) +++ branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -25,17 +25,17 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.business.persistence.UserAccount; - -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.io.Serializable; import java.util.Iterator; import java.util.Map; import java.util.Set; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.persistence.UserAccount; +import org.springframework.social.oauth1.OAuthToken; /** * User session to put in servlet session. @@ -92,6 +92,8 @@ /** User loggued account (if anonymous, then userAccount is null). */ private UserAccount userAccount; + private OAuthToken twitterRequestToken; + /** To push dynamic data which should be consumed in a page scope. */ private Map<String, Serializable> dynamicData; @@ -186,4 +188,12 @@ } } } + + public void setTwitterRequestToken(OAuthToken twitterRequestToken) { + this.twitterRequestToken = twitterRequestToken; + } + + public OAuthToken getTwitterRequestToken() { + return twitterRequestToken; + } } Added: branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/FacebookCallback.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/FacebookCallback.java (rev 0) +++ branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/FacebookCallback.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -0,0 +1,55 @@ +package org.chorem.pollen.ui.actions.user.social; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * @author Sylvain Letellier <sylvain.letellier(a)wiztivi.com> + */ +public class FacebookCallback extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public static final String HOME = "home"; + + protected String redirectUrl; + + protected String code; + + public String getRedirectUrl() { + return redirectUrl; + } + + public void setRedirectUrl(String redirectUrl) { + this.redirectUrl = redirectUrl; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + @Override + public String execute() throws Exception { + + UserAccount userAccount = getUserService().facebookCallBack(code); + getPollenSession().setUserAccount(userAccount); + addFlashMessage(_("pollen.information.your.are.loggued")); + + String result; + if (redirectUrl == null || redirectUrl.contains("/security")) { + + // After security problem, redirect to home + result = HOME; + + } else { + + // Stay on the same page identified by redirectUrl + result = SUCCESS; + } + return result; + } +} \ No newline at end of file Added: branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithFacebook.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithFacebook.java (rev 0) +++ branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithFacebook.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -0,0 +1,42 @@ +package org.chorem.pollen.ui.actions.user.social; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * @author Sylvain Letellier <sylvain.letellier(a)wiztivi.com> + */ +public class LoginWithFacebook extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public static final String HOME = "home"; + + protected String redirectUrl; + + public String getRedirectUrl() { + return redirectUrl; + } + + public void setRedirectUrl(String redirectUrl) { + this.redirectUrl = redirectUrl; + } + + @Override + public String execute() throws Exception { + + redirectUrl = getUserService().connectWithFacebook(); + + String result; + if (redirectUrl == null || redirectUrl.contains("/security")) { + + // After security problem, redirect to home + result = HOME; + + } else { + + // Stay on the same page identified by redirectUrl + result = SUCCESS; + } + return result; + } +} \ No newline at end of file Added: branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithTwitter.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithTwitter.java (rev 0) +++ branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/LoginWithTwitter.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -0,0 +1,50 @@ +package org.chorem.pollen.ui.actions.user.social; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.springframework.social.oauth1.OAuthToken; + +/** + * @author Sylvain Letellier <sylvain.letellier(a)wiztivi.com> + */ +public class LoginWithTwitter extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public static final String HOME = "home"; + + protected String redirectUrl; + + public String getRedirectUrl() { + return redirectUrl; + } + + public void setRedirectUrl(String redirectUrl) { + this.redirectUrl = redirectUrl; + } + + @Override + public String execute() throws Exception { + + ImmutablePair<OAuthToken, String> tokenAndRedirectUrl = getUserService().connectWithTwitter(); + + // keep twitter token in session + getPollenSession().setTwitterRequestToken(tokenAndRedirectUrl.getLeft()); + + // redirect to twitter login page + this.redirectUrl = tokenAndRedirectUrl.getRight(); + + String result; + if (redirectUrl == null || redirectUrl.contains("/security")) { + + // After security problem, redirect to home + result = HOME; + + } else { + + // Stay on the same page identified by redirectUrl + result = SUCCESS; + } + return result; + } +} \ No newline at end of file Added: branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/TwitterCallback.java =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/TwitterCallback.java (rev 0) +++ branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/social/TwitterCallback.java 2012-09-05 16:01:25 UTC (rev 3686) @@ -0,0 +1,64 @@ +package org.chorem.pollen.ui.actions.user.social; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * @author Sylvain Letellier <sylvain.letellier(a)wiztivi.com> + */ +public class TwitterCallback extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public static final String HOME = "home"; + + protected String redirectUrl; + + protected String oauthToken; + protected String oauthVerifier; + + public String getRedirectUrl() { + return redirectUrl; + } + + public void setRedirectUrl(String redirectUrl) { + this.redirectUrl = redirectUrl; + } + + public String getOauthToken() { + return oauthToken; + } + + public void setOauthToken(String oauthToken) { + this.oauthToken = oauthToken; + } + + public String getOauthVerifier() { + return oauthVerifier; + } + + public void setOauthVerifier(String oauthVerifier) { + this.oauthVerifier = oauthVerifier; + } + + @Override + public String execute() throws Exception { + + UserAccount userAccount = getUserService().twitterCallBack(getPollenSession().getTwitterRequestToken(), oauthVerifier); + getPollenSession().setUserAccount(userAccount); + addFlashMessage(_("pollen.information.your.are.loggued")); + + String result; + if (redirectUrl == null || redirectUrl.contains("/security")) { + + // After security problem, redirect to home + result = HOME; + + } else { + + // Stay on the same page identified by redirectUrl + result = SUCCESS; + } + return result; + } +} \ No newline at end of file Modified: branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-09-05 16:00:45 UTC (rev 3685) +++ branches/pollen-1.5-SOCIAL/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-09-05 16:01:25 UTC (rev 3686) @@ -49,6 +49,30 @@ <result type="redirect2"/> </action> +  + <action name="loginWithFacebook" class="org.chorem.pollen.ui.actions.user.social.LoginWithFacebook"> + <result name="home" type="redirectToHome"/> + <result type="redirect2"/> + </action> + +  + <action name="facebookCallback" class="org.chorem.pollen.ui.actions.user.social.FacebookCallback"> + <result name="home" type="redirectToHome"/> + <result type="redirect2"/> + </action> + +  + <action name="loginWithTwitter" class="org.chorem.pollen.ui.actions.user.social.LoginWithTwitter"> + <result name="home" type="redirectToHome"/> + <result type="redirect2"/> + </action> + +  + <action name="twitterCallback" class="org.chorem.pollen.ui.actions.user.social.TwitterCallback"> + <result name="home" type="redirectToHome"/> + <result type="redirect2"/> + </action> +  <action name="register" class="org.chorem.pollen.ui.actions.user.Register"> <result name="input">/WEB-INF/jsp/user/register.jsp</result> Modified: branches/pollen-1.5-SOCIAL/pom.xml =================================================================== --- branches/pollen-1.5-SOCIAL/pom.xml 2012-09-05 16:00:45 UTC (rev 3685) +++ branches/pollen-1.5-SOCIAL/pom.xml 2012-09-05 16:01:25 UTC (rev 3686) @@ -169,6 +169,9 @@ <hibernateVersion>3.6.10.Final</hibernateVersion> <seleniumVersion>2.25.0</seleniumVersion> <mockitoVersion>1.9.0</mockitoVersion> + <springSocialCoreVersion>1.0.2.RELEASE</springSocialCoreVersion> + <springSocialFacebookVersion>1.0.1.RELEASE</springSocialFacebookVersion> + <springSocialTwitterVersion>1.0.2.RELEASE</springSocialTwitterVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>  @@ -346,6 +349,26 @@ </exclusions> </dependency> +  + + <dependency> + <groupId>org.springframework.social</groupId> + <artifactId>spring-social-core</artifactId> + <version>${springSocialCoreVersion}</version> + </dependency> + + <dependency> + <groupId>org.springframework.social</groupId> + <artifactId>spring-social-facebook</artifactId> + <version>${springSocialFacebookVersion}</version> + </dependency> + + <dependency> + <groupId>org.springframework.social</groupId> + <artifactId>spring-social-twitter</artifactId> + <version>${springSocialTwitterVersion}</version> + </dependency> +  <dependency>

1 0

r3685 - in branches: . pollen-1.5-SOCIAL
by sletellier＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: sletellier Date: 2012-09-05 18:00:45 +0200 (Wed, 05 Sep 2012) New Revision: 3685 Url: http://chorem.org/repositories/revision/pollen/3685 Log: Creating branche to add social registration Added: branches/pollen-1.5-SOCIAL/ Property changes on: branches/pollen-1.5-SOCIAL ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3684 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 12:58:51 +0200 (Wed, 05 Sep 2012) New Revision: 3684 Url: http://chorem.org/repositories/revision/pollen/3684 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-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-persistence/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-services/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 10:58:48 UTC (rev 3683) +++ trunk/pom.xml 2012-09-05 10:58:51 UTC (rev 3684) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5.1</version> + <version>1.5-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5.1</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5.1 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4.5.1</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3683 - in tags: . pollen-1.4.5.1
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 12:58:48 +0200 (Wed, 05 Sep 2012) New Revision: 3683 Url: http://chorem.org/repositories/revision/pollen/3683 Log: [maven-release-plugin] copy for tag pollen-1.4.5.1 Added: tags/pollen-1.4.5.1/ Property changes on: tags/pollen-1.4.5.1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3682 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 12:58:45 +0200 (Wed, 05 Sep 2012) New Revision: 3682 Url: http://chorem.org/repositories/revision/pollen/3682 Log: [maven-release-plugin] prepare release pollen-1.4.5.1 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-persistence/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-services/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-05 10:51:03 UTC (rev 3681) +++ trunk/pom.xml 2012-09-05 10:58:45 UTC (rev 3682) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.4.5.1</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5.1</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5.1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4.5.1</url> </scm> <distributionManagement>

1 0

r3681 - trunk/pollen-ui-struts2/src/main/assembly/dist
by tchemit＠users.chorem.org Sept. 5, 2012

Sept. 5, 2012

Author: tchemit Date: 2012-09-05 12:51:03 +0200 (Wed, 05 Sep 2012) New Revision: 3681 Url: http://chorem.org/repositories/revision/pollen/3681 Log: fixes #803: Portable Pollen version does not start using given scripts Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-09-04 16:54:54 UTC (rev 3680) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-09-05 10:51:03 UTC (rev 3681) @@ -9,7 +9,7 @@ set POLLEN_OPTS="-Xms512m -Xmx1024m -Dpollen.log.dir=./logs" echo java options used : %POLLEN_OPTS% -%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-embedded-${project.version}.war %1 %2 %3 %4 %5 %6 %7 %8 %9 +%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-${project.version}-embedded.war %1 %2 %3 %4 %5 %6 %7 %8 %9 pause cmd /C exit /B %ERROR_CODE% Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-09-04 16:54:54 UTC (rev 3680) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-09-05 10:51:03 UTC (rev 3681) @@ -11,6 +11,6 @@ OLDPWD=`pwd` cd `dirname $0` CURRENTPWD=`pwd` -POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -Dpollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war $* +POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx1024m -Dpollen.log.dir=$CURRENTPWD/logs" +java $POLLEN_OPTS -jar pollen-${project.version}-embedded.war $* cd "$OLDPWD" \ No newline at end of file

1 0

r3680 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by maven-release＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: maven-release Date: 2012-09-04 18:54:54 +0200 (Tue, 04 Sep 2012) New Revision: 3680 Url: http://chorem.org/repositories/revision/pollen/3680 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-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-persistence/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-services/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 16:54:52 UTC (rev 3679) +++ trunk/pom.xml 2012-09-04 16:54:54 UTC (rev 3680) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5</version> + <version>1.5-SNAPSHOT</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4.5</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3679 - in tags: . pollen-1.4.5
by maven-release＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: maven-release Date: 2012-09-04 18:54:52 +0200 (Tue, 04 Sep 2012) New Revision: 3679 Url: http://chorem.org/repositories/revision/pollen/3679 Log: [maven-release-plugin] copy for tag pollen-1.4.5 Added: tags/pollen-1.4.5/ Property changes on: tags/pollen-1.4.5 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3678 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting pollen-votecounting-api pollen-votecounting-strategy pollen-votecounting-strategy-borda pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-instant-runoff pollen-votecounting-strategy-normal pollen-votecounting-strategy-number pollen-votecounting-strategy-percentage
by maven-release＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: maven-release Date: 2012-09-04 18:54:50 +0200 (Tue, 04 Sep 2012) New Revision: 3678 Url: http://chorem.org/repositories/revision/pollen/3678 Log: [maven-release-plugin] prepare release pollen-1.4.5 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-persistence/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-services/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> @@ -428,8 +426,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir - dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes"/> + <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> </target> </configuration> <goals> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -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.4.5-SNAPSHOT</version> + <version>1.4.5</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-09-04 16:44:19 UTC (rev 3677) +++ trunk/pom.xml 2012-09-04 16:54:50 UTC (rev 3678) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4.5-SNAPSHOT</version> + <version>1.4.5</version> <modules> <module>pollen-votecounting-api</module> @@ -539,11 +539,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.4.5 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.4.5</url> </scm> <distributionManagement>

1 0

r3677 - in trunk: pollen-votecounting-strategy-coombs/src/test/resources pollen-votecounting-strategy-instant-runoff/src/test/resources pollen-votecounting-strategy-normal/src/test/resources pollen-votecounting-strategy-number/src/test/resources pollen-votecounting-strategy-percentage/src/test/resources
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:44:19 +0200 (Tue, 04 Sep 2012) New Revision: 3677 Url: http://chorem.org/repositories/revision/pollen/3677 Log: add missing svn properties + license headers Modified: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties Modified: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Coombs +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Instant Runoff +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Normal +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Number +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-09-04 16:32:29 UTC (rev 3676) +++ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-09-04 16:44:19 UTC (rev 3677) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Percentage +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output...

1 0

r3676 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:32:29 +0200 (Tue, 04 Sep 2012) New Revision: 3676 Url: http://chorem.org/repositories/revision/pollen/3676 Log: fix delete vote (accountId not remove from url if creator on free poll...) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java 2012-09-04 16:17:33 UTC (rev 3675) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java 2012-09-04 16:32:29 UTC (rev 3676) @@ -71,12 +71,18 @@ addFlashMessage(_("pollen.information.vote.deleted")); - if (poll.isPollFree() && - getUserSecurityContext().isWithAccountId() && - !getUserSecurityContext().isCreator()) { + if (poll.isPollFree() && getUserSecurityContext().isWithAccountId()){ - // remove accountId from url, voter does no longer exists. - getPollUri().setAccountId(null); + // must remove accountId from url if not creator accountId + + String userAccountId = getUserSecurityContext().getAccountId(); + String creatorId = getUserSecurityContext().getPoll().getCreator().getAccountId(); + + if (!creatorId.equals(userAccountId)) { + + // remove accountId from url, the accountId does no longer exists. + getPollUri().setAccountId(null); + } } return SUCCESS; }

1 0

r3675 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:17:33 +0200 (Tue, 04 Sep 2012) New Revision: 3675 Url: http://chorem.org/repositories/revision/pollen/3675 Log: fixes #802: Cannot delete my vote (does not work if poll can not have comments) Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-09-04 16:00:18 UTC (rev 3674) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-09-04 16:17:33 UTC (rev 3675) @@ -462,9 +462,9 @@ </div> - <sj:dialog id="confirmDialog" resizable="false" autoOpen="false" - modal="true" - width="800"/> </div> </s:if> </s:if> + +<sj:dialog id="confirmDialog" resizable="false" autoOpen="false" + modal="true" width="800"/> \ No newline at end of file

1 0

r3674 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/test/java/org/chorem/pollen/business/persistence pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 18:00:18 +0200 (Tue, 04 Sep 2012) New Revision: 3674 Url: http://chorem.org/repositories/revision/pollen/3674 Log: fixes #801: Unicity of vote id is not correct Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -65,14 +65,14 @@ return result; } - public boolean hasAlreadyVoted(Poll poll, String votingId) throws TopiaException { + public Vote findVoteByPollAndVotingId(Poll poll, String votingId) throws TopiaException { - String hql = "SELECT COUNT(*) FROM VoteImpl e, PollImpl p WHERE " + + String hql = "SELECT e FROM VoteImpl e, PollImpl p WHERE " + "p = :p AND " + "e in elements(p.vote) AND " + "e.pollAccount.votingId = :v"; - boolean result = existsByQuery(hql, "p", poll, "v", votingId); + Vote result = findByQuery(Vote.class, hql, "p", poll, "v", votingId); return result; } Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -128,7 +128,7 @@ } @Test - public void hasAlreadyVoted() throws Exception { + public void findVoteByPollAndVotingId() throws Exception { TopiaContext tx = beginTransaction(); @@ -158,16 +158,16 @@ tx.commitTransaction(); - boolean actual; - actual = voteDAO.hasAlreadyVoted(poll1, votingId1); - Assert.assertTrue(actual); - actual = voteDAO.hasAlreadyVoted(poll2, votingId1); - Assert.assertFalse(actual); + Vote actual; + actual = voteDAO.findVoteByPollAndVotingId(poll1, votingId1); + Assert.assertNotNull(actual); + actual = voteDAO.findVoteByPollAndVotingId(poll2, votingId1); + Assert.assertNull(actual); - actual = voteDAO.hasAlreadyVoted(poll1, votingId2); - Assert.assertFalse(actual); - actual = voteDAO.hasAlreadyVoted(poll2, votingId2); - Assert.assertTrue(actual); + actual = voteDAO.findVoteByPollAndVotingId(poll1, votingId2); + Assert.assertNull(actual); + actual = voteDAO.findVoteByPollAndVotingId(poll2, votingId2); + Assert.assertNotNull(actual); } @Test Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -364,10 +364,23 @@ } } - public boolean hasAlreadyVoted(Poll poll, String votingId) { + public boolean isVotingIdFree(Poll poll, + String pollAccountId, + String votingId) { try { VoteDAO dao = getDAO(Vote.class); - boolean result = dao.hasAlreadyVoted(poll, votingId); + Vote existingVote = dao.findVoteByPollAndVotingId(poll, votingId); + boolean result; + if (existingVote == null) { + // no such vote + // votingId is free + result = true; + } else { + + // there is a vote using this votingId + // votingId is free only if the pollAccount is the incoming one + result = existingVote.getPollAccount().getTopiaId().equals(pollAccountId); + } return result; } catch (Exception e) { throw new PollenTechnicalException( Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-09-04 15:40:30 UTC (rev 3673) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-09-04 16:00:18 UTC (rev 3674) @@ -98,9 +98,8 @@ _("pollen.error.pollAccount.votingId.required")); } - // check if the new pollAccount (topiaId = null) has already voted - if (pollAccount.getTopiaId() == null && - getVoteService().hasAlreadyVoted(poll, name)) { + // check if the votingId is available + if (!getVoteService().isVotingIdFree(poll, pollAccount.getTopiaId(),name)) { addFieldError("pollAccount.votingId", _("pollen.error.user.alreadyVoted", name)); }

1 0

r3673 - trunk/pollen-persistence/src/main/resources/i18n
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 17:40:30 +0200 (Tue, 04 Sep 2012) New Revision: 3673 Url: http://chorem.org/repositories/revision/pollen/3673 Log: fix typo Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-09-04 15:36:19 UTC (rev 3672) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-09-04 15:40:30 UTC (rev 3673) @@ -27,10 +27,10 @@ pollen.pollCommentVisibilty.everybody=Utiliser les commentaires pollen.pollCommentVisibilty.nobody=Interdir les commentaires sur le sondage pollen.pollVoteVisibilty.creatorOnly=Visible pour le créateur -pollen.pollVoteVisibilty.creatorOnly.help=Seule le créateur ou un administrateur peut voir les votes +pollen.pollVoteVisibilty.creatorOnly.help=Seul le créateur ou un administrateur peut voir les votes pollen.pollVoteVisibilty.everybody=Vote publique pollen.pollVoteVisibilty.everybody.help=Tout le monde peut voir les votes pollen.pollVoteVisibilty.nobody=Sondage anonyme pollen.pollVoteVisibilty.nobody.help=Le sondage est anonyme, personne ne peut voir les votes pollen.pollVoteVisibilty.participantOnly=Visible pour les participants -pollen.pollVoteVisibilty.participantOnly.help=Seul les participants du sondage peuvent voir les votes +pollen.pollVoteVisibilty.participantOnly.help=Seuls les participants du sondage peuvent voir les votes

1 0

r3672 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 17:36:19 +0200 (Tue, 04 Sep 2012) New Revision: 3672 Url: http://chorem.org/repositories/revision/pollen/3672 Log: fixes #802: Cannot delete my vote Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-09-04 14:06:07 UTC (rev 3671) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-09-04 15:36:19 UTC (rev 3672) @@ -328,7 +328,7 @@ </s:a> </s:if> <s:if test="isDeleteVoteAllowed(#vote)"> - <s:a action="deleteVote/%{pollUri}" namespace="/poll" href="#" + <s:a namespace="/poll" href="#" onclick="return openDeleteVoteDialog('%{#vote.topiaId}');" id='deleteVote_%{#vote.pollAccount.accountId}'> <img src="<s:url value="/img/delete.png"/>"

1 0

r3671 - in trunk: pollen-votecounting-strategy-coombs/src/test/resources pollen-votecounting-strategy-instant-runoff/src/test/resources pollen-votecounting-strategy-normal/src/test/resources pollen-votecounting-strategy-number/src/test/resources pollen-votecounting-strategy-percentage/src/test/resources src/site src/site/fr/rst src/site/rst
by tchemit＠users.chorem.org Sept. 4, 2012

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 16:06:07 +0200 (Tue, 04 Sep 2012) New Revision: 3671 Url: http://chorem.org/repositories/revision/pollen/3671 Log: improve doc re-add log4j config files (for tests) Added: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties Modified: trunk/src/site/fr/rst/configure.rst trunk/src/site/fr/rst/depouillement.rst trunk/src/site/rst/methods.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Copied: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Copied: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties (from rev 3670, trunk/pollen-votecounting-strategy-borda/src/test/resources/log4j.properties) =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-09-04 14:06:07 UTC (rev 3671) @@ -0,0 +1,8 @@ +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Modified: trunk/src/site/fr/rst/configure.rst =================================================================== --- trunk/src/site/fr/rst/configure.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/fr/rst/configure.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -101,4 +101,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _page des options: ./pollen-ui-struts2/application-config-report.html +.. _page des options: ./application-config-report.html Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/fr/rst/depouillement.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -82,3 +82,17 @@ - la somme des nombres parmi les votes non blanc - la moyenne des nombres parmi les votes non blanc +Méthode Coombs +-------------- + +A venir en version 2.5 (http://chorem.org/issues/543) + +Méthode instant-runoff +---------------------- + +A venir en version 2.5 (http://chorem.org/issues/541) + +Méthode Borda +------------- + +A venir en version 2.5 (http://chorem.org/issues/542) Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/rst/methods.rst 2012-09-04 14:06:07 UTC (rev 3671) @@ -79,3 +79,19 @@ - The number of white votes - The sum of votes among non-white - The average number of votes among non-white + +Méthode Coombs +-------------- + +Coming soon in version 2.5 (http://chorem.org/issues/543) + +Méthode instant-runoff +---------------------- + +Coming soon in version 2.5 (http://chorem.org/issues/541) + +Méthode Borda +------------- + +Coming soon in version 2.5 (http://chorem.org/issues/542) + Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/site_en.xml 2012-09-04 14:06:07 UTC (rev 3671) @@ -56,23 +56,23 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.nuiton.org/public/images/logos/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="http://maven-site.nuiton.org/public/images/struts2-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="http://maven-site.nuiton.org/public/images/topia-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="http://maven-site.nuiton.org/public/images/argouml-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -97,6 +97,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <menu name="User documentation"> + <item name="Home" href="./index.html"/> + <item name="Vote counting methods" href="./methods.html"/> + </menu> + <menu name="Install"> <item name="Install Pollen" href="install.html"/> <item name="Configure Pollen" href="configure.html"/> @@ -120,7 +125,7 @@ <menu ref="reports"/> <footer> - <div id='projectMetas' + <div id='projectMetas' locale='en' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-09-04 13:17:44 UTC (rev 3670) +++ trunk/src/site/site_fr.xml 2012-09-04 14:06:07 UTC (rev 3671) @@ -97,6 +97,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <menu name="Documentation utilisateur"> + <item name="Accueil" href="./index.html"/> + <item name="Méthodes de dépouillement" href="./depouillement.html"/> + </menu> + <menu name="Installation"> <item name="Installer Pollen" href="install.html"/> <item name="Configurer Pollen" href="configure.html"/> @@ -107,7 +112,7 @@ <item name="Instance de tests (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen"/> </menu> - <menu name="Language"> + <menu name="Langue"> <item name="Français" href="index.html"/> <item name="English" href="../index.html"/> </menu> @@ -116,7 +121,7 @@ <footer> - <div id='projectMetas' + <div id='projectMetas' locale='fr' projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}'

1 0

Sept. 4, 2012

Author: tchemit Date: 2012-09-04 15:17:44 +0200 (Tue, 04 Sep 2012) New Revision: 3670 Url: http://chorem.org/repositories/revision/pollen/3670 Log: fixes #800: Updates to nuiton-i18n 2.5 fixes #720: Updates to nuiton-utils 2.6.1 fixes #781: Updates to topia 2.6.13 do not generate site for modules Removed: trunk/pollen-persistence/src/site/ trunk/pollen-services/src/site/ trunk/pollen-ui-struts2/src/site/ trunk/pollen-votecounting-api/src/site/ trunk/pollen-votecounting-strategy-borda/src/site/ trunk/pollen-votecounting-strategy-condorcet/src/site/ trunk/pollen-votecounting-strategy-coombs/src/site/ trunk/pollen-votecounting-strategy-instant-runoff/src/site/ trunk/pollen-votecounting-strategy-normal/src/site/ trunk/pollen-votecounting-strategy-number/src/site/ trunk/pollen-votecounting-strategy-percentage/src/site/ trunk/pollen-votecounting-strategy/src/site/ trunk/pollen-votecounting/src/site/ Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting-api/pom.xml trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy/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-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-persistence/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -82,6 +82,12 @@ <name>Pollen :: Persistence</name> <description>Pollen Persistence Layer</description> + <properties> +  + <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> + <build> <plugins> @@ -124,7 +130,7 @@ </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <configuration> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-services/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -113,13 +113,19 @@ <name>Pollen :: Services</name> <description>Pollen Service Layer</description> + <properties> +  + <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> + <build> <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-ui-struts2/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -316,10 +316,20 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>parseJsp</id> <goals> + <goal>parserStruts2</goal> + </goals> + <configuration> + <acceptKeyFormat>^pollen\..*$</acceptKeyFormat> + </configuration> + </execution> + <execution> + <id>parseOthersAndGenBundle</id> + <goals> <goal>parserValidation</goal> <goal>parserJava</goal> <goal>gen</goal> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -48,7 +48,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-api/pom.xml =================================================================== --- trunk/pollen-votecounting-api/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-api/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -47,7 +47,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -71,7 +71,6 @@ Aggregator of all implementations of votecounting strategy </description> - <packaging>pom</packaging> <profiles> Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -51,7 +51,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -49,7 +49,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -51,7 +51,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -51,7 +51,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -45,7 +45,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -45,7 +45,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -53,7 +53,7 @@ <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/pom.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -54,7 +54,7 @@ <developer> <id>tchemit</id> <name>Tony Chemit</name> - <email>chemit at codelutin.com</email> + <email>chemit at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -66,7 +66,7 @@ <developer> <id>jcouteau</id> <name>Jean Couteau</name> - <email>couteau at codelutin.com</email> + <email>couteau at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -78,7 +78,7 @@ <developer> <id>fdesbois</id> <name>Florian Desbois</name> - <email>desbois at codelutin.com</email> + <email>desbois at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -89,7 +89,7 @@ <developer> <id>kmorin</id> <name>Kevin Morin</name> - <email>morin at codelutin.com</email> + <email>morin at codelutin dot com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>Europe/Paris</timezone> @@ -153,12 +153,12 @@ <projectId>pollen</projectId>  - <topiaVersion>2.6.12</topiaVersion> + <topiaVersion>2.6.13</topiaVersion> <eugenePluginVersion>2.5</eugenePluginVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <nuitonI18nVersion>2.5</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.6</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.1</nuitonUtilsVersion> <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version> @@ -508,7 +508,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> @@ -682,6 +682,23 @@ </profile> +  + <profile> + <id>not-site</id> + <activation> + <file> + <missing>src/site</missing> + </file> + </activation> + + + <properties> +  + <maven.site.skip>true</maven.site.skip> + <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> + + </profile> </profiles> </project> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/src/site/site_en.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> @@ -79,15 +79,15 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + src="http://maven-site.chorem.org/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + href="http://maven-site.chorem.org/public/css/mavenpom-site.css"/> </head> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> @@ -108,13 +108,13 @@ </menu> <menu name="Language"> - <item name="Français" href="fr/index.html"/> - <item name="English" href="index.html"/> + <item name="Français" href="./fr/index.html"/> + <item name="English" href="./index.html"/> </menu> <menu name="Technical"> - <item name="Security" href="security.html"/> - <item name="UI Tests" href="tests.html"/> + <item name="Security" href="./security.html"/> + <item name="UI Tests" href="./tests.html"/> </menu> <menu ref="reports"/> @@ -124,7 +124,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-30 14:45:28 UTC (rev 3669) +++ trunk/src/site/site_fr.xml 2012-09-04 13:17:44 UTC (rev 3670) @@ -38,7 +38,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.3.0</version> </skin> <custom> @@ -79,15 +79,15 @@ <head> <script type="text/javascript" - src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + src="http://maven-site.nuiton.org/public/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/> </head> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="./index.html"/> </breadcrumbs> <links> @@ -120,7 +120,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0