Author: tchemit Date: 2012-08-25 20:51:42 +0200 (Sat, 25 Aug 2012) New Revision: 3628 Url: http://chorem.org/repositories/revision/pollen/3628 Log: add mecanism to make real its Added: trunk/pollen-ui-struts2/src/it/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/LICENSE.txt trunk/pollen-ui-struts2/src/it/pollVoteVisibility/changelog.txt trunk/pollen-ui-struts2/src/it/pollVoteVisibility/goals.txt trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/poll/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/poll/ui/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/poll/ui/it/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/db/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/db/pollendb.h2.db trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/075ab18c50c74f83b894c042bba84ff5.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/2262a31f374e4969bb3593e762c0cae6.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3300e59939bd4c9797e360060b8e54be.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4cd79d032aa7433d9944ec9376c385c0.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7103c6d4a79246699425e99e1f344b98.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/87cb5b1529374ac0b8c6b7f0b98e169c.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b321ddccf7d743bf9c67b2664231d14f.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/cacb52f4d49047b7a7aa24ec528fcc87.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e61a350a1d714e479aad526ee85b7bc6.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/fdd43f4c8d614a9aa48047804583508a.xml trunk/pollen-ui-struts2/src/it/pollen-ui-it/ trunk/pollen-ui-struts2/src/it/pollen-ui-it/LICENSE.txt trunk/pollen-ui-struts2/src/it/pollen-ui-it/README.txt trunk/pollen-ui-struts2/src/it/pollen-ui-it/changelog.txt trunk/pollen-ui-struts2/src/it/pollen-ui-it/goals.txt trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/ trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/config/ trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/config/pollen-it.properties trunk/pollen-ui-struts2/src/it/settings.xml Removed: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/db/ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/feeds/ trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/ Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-08-24 15:47:45 UTC (rev 3627) +++ trunk/pollen-ui-struts2/pom.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -322,6 +322,18 @@ </executions> </plugin> + <plugin> + + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> <pluginManagement> @@ -538,6 +550,60 @@ </profile> <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <localRepositoryPath> + ${project.build.directory}/it-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + </configuration> + <executions> + <execution> + <id>pre-integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>pre-integration-test</phase> + <configuration> + <pomIncludes> + <pomInclude>pollen-ui-it/pom.xml</pomInclude> + </pomIncludes> + </configuration> + </execution> + + <execution> + <id>integration-test</id> + <goals> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + <configuration> + <pomIncludes> + <pomInclude>pollVoteVisibility/pom.xml</pomInclude> + </pomIncludes> + </configuration> + </execution> + + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>reporting</id> <activation> <property> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/its/pollVoteVisibility/README.txt 2012-08-24 15:47:45 UTC (rev 3627) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/README.txt 2012-08-25 18:51:42 UTC (rev 3628) @@ -10,7 +10,7 @@ by not connected user ~~~~~~~~~~~~~~~~~~~~~ -admin cacb52f4d49047b7a7aa24ec528fcc87:e814ba6e25174d5983ad796c400520f5 (peut voter) +admin poll/summrary/cacb52f4d49047b7a7aa24ec528fcc87:e814ba6e25174d5983ad796c400520f5 (peut voter) vote anonyme cacb52f4d49047b7a7aa24ec528fcc87:56acbf87f3c049c2adc757ef1da88ee1 (a,b) (votes non visibles) vote creator (interdit, votes non visibles) vote moderate (votes non visibles) @@ -20,7 +20,7 @@ by connected user ~~~~~~~~~~~~~~~~~ -admin fdd43f4c8d614a9aa48047804583508a:9a8e8523f1ba404f8fde45d1844c59ac (peut voter) +admin poll/summrary/fdd43f4c8d614a9aa48047804583508a:9a8e8523f1ba404f8fde45d1844c59ac (peut voter) vote anonyme fdd43f4c8d614a9aa48047804583508a:07dc154dce514d368441eaa9f27d21e0 (a,b) (votes non visibles) vote creator (interdit connecté ou pas, votes non visibles) vote moderate (votes non visibles) @@ -31,7 +31,7 @@ by admin user ~~~~~~~~~~~~~ -admin 87cb5b1529374ac0b8c6b7f0b98e169c:65a3caf0bf204226bfcd259c69e56ca8 (peut voter) +admin poll/summrary/87cb5b1529374ac0b8c6b7f0b98e169c:65a3caf0bf204226bfcd259c69e56ca8 (peut voter) vote anonyme 87cb5b1529374ac0b8c6b7f0b98e169c:a0ff6892a28b4a65809b16cd8903245e (a,b) vote creator (interdit connecté ou pas, votes non visibles) vote moderate (votes non visibles) @@ -45,7 +45,7 @@ by not connected user ~~~~~~~~~~~~~~~~~~~~~ -admin e61a350a1d714e479aad526ee85b7bc6:8517bd2f6b414072b3d9d6c4cb7e5fd0 (peut voter) +admin poll/summrary/e61a350a1d714e479aad526ee85b7bc6:8517bd2f6b414072b3d9d6c4cb7e5fd0 (peut voter) vote anonyme e61a350a1d714e479aad526ee85b7bc6:e8fd28021faa434aa466c5f6bdbc6e94 (a,b) (votes non visibles) vote creator (vote interdit, votes visibles) vote moderate (vote interdit, votes visibles) @@ -57,7 +57,7 @@ by connected user ~~~~~~~~~~~~~~~~~ -admin 075ab18c50c74f83b894c042bba84ff5:0f51b7c953f6427f9c85807fa838d44f (peut voter) +admin poll/summrary/075ab18c50c74f83b894c042bba84ff5:0f51b7c953f6427f9c85807fa838d44f (peut voter) vote anonyme 075ab18c50c74f83b894c042bba84ff5:4937a887797a4ab5ac618152383512ae (a,b) (votes non visibles) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) @@ -69,7 +69,7 @@ by admin user ~~~~~~~~~~~~~ -admin a04bd349d8964c4fad48ac6ececc60a0:a1346bb80bb84913983e91673c76e80c (peut voter) +admin poll/summrary/a04bd349d8964c4fad48ac6ececc60a0:a1346bb80bb84913983e91673c76e80c (peut voter) vote anonyme a04bd349d8964c4fad48ac6ececc60a0:e6fa20f2afb24bdebfdc579c2574a3ab (a,b) (votes non visibles) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) @@ -83,7 +83,7 @@ by not connected user ~~~~~~~~~~~~~~~~~~~~~ -admin 8518ede7bf1247d2ba0dfe222575c5ba:ea5c96d4d44547f9b0717f30bfa6dd03 (peut voter) +admin poll/summrary/8518ede7bf1247d2ba0dfe222575c5ba:ea5c96d4d44547f9b0717f30bfa6dd03 (peut voter) vote anonyme 8518ede7bf1247d2ba0dfe222575c5ba:fa914a31f6c94cfa8561f48e3c45d6cf (a,b) (votes visibles) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) @@ -94,7 +94,7 @@ by connected user ~~~~~~~~~~~~~~~~~ -admin b321ddccf7d743bf9c67b2664231d14f:a48f1b97a3f84443845009c074298bce (peut voter) +admin poll/summrary/b321ddccf7d743bf9c67b2664231d14f:a48f1b97a3f84443845009c074298bce (peut voter) vote anonyme b321ddccf7d743bf9c67b2664231d14f:938e4831d7d547a59fd6d76c3bdfe6b5 (a,b) (votes visibles) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) @@ -105,7 +105,7 @@ by admin user ~~~~~~~~~~~~~ -admin 7103c6d4a79246699425e99e1f344b98:717ebe61a3b64fcea453c9cba5953149 (peut voter) +admin poll/summrary/7103c6d4a79246699425e99e1f344b98:717ebe61a3b64fcea453c9cba5953149 (peut voter) vote anonyme 7103c6d4a79246699425e99e1f344b98:ad50a5d406d84aa09e3a02dd9ad0116c (a,b) (vote visibles) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) @@ -119,7 +119,7 @@ by not connected user ~~~~~~~~~~~~~~~~~~~~~ -admin 2262a31f374e4969bb3593e762c0cae6:659bb046fc06493f9909ca9f34ca6261 (peut voter) +admin poll/summrary/2262a31f374e4969bb3593e762c0cae6:659bb046fc06493f9909ca9f34ca6261 (peut voter) vote anonyme 2262a31f374e4969bb3593e762c0cae6:6909131490ab4a1abae0daaf15129cdb (a,b) (votes visibles) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) @@ -130,7 +130,7 @@ by connected user ~~~~~~~~~~~~~~~~~ -admin 4cd79d032aa7433d9944ec9376c385c0:f26e253004d14547b465b5a414b65a7f (peut voter) +admin poll/summrary/4cd79d032aa7433d9944ec9376c385c0:f26e253004d14547b465b5a414b65a7f (peut voter) vote anonyme 4cd79d032aa7433d9944ec9376c385c0:307222b5e17442758bd23fc9d8a19f5e (a,b) (votes visibles) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) @@ -141,7 +141,7 @@ by admin user ~~~~~~~~~~~~~ -admin 3300e59939bd4c9797e360060b8e54be:c370172faf7a4108be0d76630af34c4b (peut voter) +admin poll/summrary/3300e59939bd4c9797e360060b8e54be:c370172faf7a4108be0d76630af34c4b (peut voter) vote anonyme 3300e59939bd4c9797e360060b8e54be:4399e0ff6dbe4544b64861d1e234ee1a (a,b) (sondage present dans sondages participes) vote creator (vote interdit mais peut admin les votes) vote moderate (vote interdit mais peut admin les votes) Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/goals.txt =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/goals.txt (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/goals.txt 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1 @@ +clean post-integration-test -Prun-it \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,19 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem.pollen.it</groupId> + <artifactId>pollen-ui-it</artifactId> + <version>1.4.5-SNAPSHOT</version> + </parent> + + <artifactId>pollVoteVisibility</artifactId> + <name>Pollen :: IT pollVoteVisibility</name> + <description>pollVoteVisibility</description> + +</project> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + #%L + Pollen :: UI (struts2) + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/jetty/jetty-con... $ + %% + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + %% + 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% + --> + +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> + +<Configure class="org.eclipse.jetty.webapp.WebAppContext"> + <Call name="setAttribute"> + <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> + <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> + </Call> +</Configure> \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/db/pollendb.h2.db =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/db/pollendb.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/075ab18c50c74f83b894c042bba84ff5.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/075ab18c50c74f83b894c042bba84ff5.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/075ab18c50c74f83b894c042bba84ff5.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyCreator free poll (by conntected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <subtitle>sondage libre dont les votes ne sont visibles que par le créateur ou un administrateur (crée par un utilisateur connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:22:00Z</updated> + <published>2012-08-24T09:22:00Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:22:00Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connecter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:23:34Z</updated> + <published>2012-08-24T09:23:34Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:23:34Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:25:15Z</updated> + <published>2012-08-24T09:25:15Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:25:15Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:25:43Z</updated> + <published>2012-08-24T09:25:43Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:25:43Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5</id> + <updated>2012-08-24T09:27:46Z</updated> + <published>2012-08-24T09:27:46Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:creator /> + <dc:date>2012-08-24T09:27:46Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user2@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> + <author> + <name /> + </author> + <updated>2012-08-24T09:33:30Z</updated> + <published>2012-08-24T09:33:30Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T09:33:30Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/075ab18c50c74f83b894c042bba84ff5.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/2262a31f374e4969bb3593e762c0cae6.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/2262a31f374e4969bb3593e762c0cae6.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/2262a31f374e4969bb3593e762c0cae6.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : everybody free poll (by not connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <subtitle>sondage libre dont les votes sont visibles par tous (crée par un utilisateur non connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T09:53:11Z</updated> + <published>2012-08-24T09:53:11Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:53:11Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T12:18:52Z</updated> + <published>2012-08-24T12:18:52Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:18:52Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T12:20:02Z</updated> + <published>2012-08-24T12:20:02Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:20:02Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6</id> + <updated>2012-08-24T12:24:43Z</updated> + <published>2012-08-24T12:24:43Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:24:43Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> + <author> + <name /> + </author> + <updated>2012-08-24T12:25:10Z</updated> + <published>2012-08-24T12:25:10Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T12:25:10Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/2262a31f374e4969bb3593e762c0cae6.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3300e59939bd4c9797e360060b8e54be.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3300e59939bd4c9797e360060b8e54be.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3300e59939bd4c9797e360060b8e54be.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : everybody free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <subtitle>sondage libre dont les votes sont visibles par tous (crée par un administrateur)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be</id> + <updated>2012-08-24T09:52:27Z</updated> + <published>2012-08-24T09:52:27Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:52:27Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be</id> + <updated>2012-08-24T13:28:22Z</updated> + <published>2012-08-24T13:28:22Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T13:28:22Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be</id> + <updated>2012-08-24T13:29:19Z</updated> + <published>2012-08-24T13:29:19Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T13:29:19Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> + <author> + <name /> + </author> + <updated>2012-08-24T13:30:31Z</updated> + <published>2012-08-24T13:30:31Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T13:30:31Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3300e59939bd4c9797e360060b8e54be.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4cd79d032aa7433d9944ec9376c385c0.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4cd79d032aa7433d9944ec9376c385c0.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4cd79d032aa7433d9944ec9376c385c0.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : everybody free poll (by connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <subtitle>sondage libre dont les votes sont visibles par tous (crée par un utilisateur connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0</id> + <updated>2012-08-24T09:53:59Z</updated> + <published>2012-08-24T09:53:59Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:53:59Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0</id> + <updated>2012-08-24T12:36:22Z</updated> + <published>2012-08-24T12:36:22Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:36:22Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0</id> + <updated>2012-08-24T13:12:31Z</updated> + <published>2012-08-24T13:12:31Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T13:12:31Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> + <author> + <name /> + </author> + <updated>2012-08-24T13:24:53Z</updated> + <published>2012-08-24T13:24:53Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T13:24:53Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4cd79d032aa7433d9944ec9376c385c0.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7103c6d4a79246699425e99e1f344b98.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7103c6d4a79246699425e99e1f344b98.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7103c6d4a79246699425e99e1f344b98.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyVoter free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <subtitle>sondage libre dont les votes ne sont visibles que par les participants, créateurs et admin (crée par un administrateur)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T09:51:17Z</updated> + <published>2012-08-24T09:51:17Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:51:17Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:07:26Z</updated> + <published>2012-08-24T11:07:26Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:07:26Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:09:10Z</updated> + <published>2012-08-24T11:09:10Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:09:10Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:10:31Z</updated> + <published>2012-08-24T11:10:31Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:creator /> + <dc:date>2012-08-24T11:10:31Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:12:33Z</updated> + <published>2012-08-24T11:12:33Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:12:33Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T11:15:22Z</updated> + <published>2012-08-24T11:15:22Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:creator /> + <dc:date>2012-08-24T11:15:22Z</dc:date> + </entry> + <entry> + <title>Delete vote of 'not connected' for reason ''</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98</id> + <updated>2012-08-24T12:16:02Z</updated> + <published>2012-08-24T12:16:02Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:16:02Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> + <author> + <name /> + </author> + <updated>2012-08-24T12:17:13Z</updated> + <published>2012-08-24T12:17:13Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T12:17:13Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7103c6d4a79246699425e99e1f344b98.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyVoter free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <subtitle>sondage libre dont les votes ne sont visibles que par les participants, créateurs et admin</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba</id> + <updated>2012-08-24T09:48:47Z</updated> + <published>2012-08-24T09:48:47Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:48:47Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba</id> + <updated>2012-08-24T10:13:26Z</updated> + <published>2012-08-24T10:13:26Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T10:13:26Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba</id> + <updated>2012-08-24T11:02:46Z</updated> + <published>2012-08-24T11:02:46Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T11:02:46Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> + <author> + <name /> + </author> + <updated>2012-08-24T11:05:11Z</updated> + <published>2012-08-24T11:05:11Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T11:05:11Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8518ede7bf1247d2ba0dfe222575c5ba.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/87cb5b1529374ac0b8c6b7f0b98e169c.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/87cb5b1529374ac0b8c6b7f0b98e169c.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/87cb5b1529374ac0b8c6b7f0b98e169c.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : anonymous free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c" /> + <subtitle>sondage anonyme libre (tout le monde peut voter mais personne ne voit les votes) créé par un administrateur</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c</id> + <updated>2012-08-23T22:28:04Z</updated> + <published>2012-08-23T22:28:04Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-23T22:28:04Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c</id> + <updated>2012-08-23T22:28:59Z</updated> + <published>2012-08-23T22:28:59Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-23T22:28:59Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c</id> + <updated>2012-08-23T22:29:49Z</updated> + <published>2012-08-23T22:29:49Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-23T22:29:49Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c" /> + <author> + <name /> + </author> + <updated>2012-08-23T22:34:35Z</updated> + <published>2012-08-23T22:34:35Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-23T22:34:35Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/87cb5b1529374ac0b8c6b7f0b98e169c.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyCreator free poll (by admin user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <subtitle>sondage libre dont les votes ne sont visibles que par le créateur ou un administrateur (crée par un administrateur)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0</id> + <updated>2012-08-24T09:36:06Z</updated> + <published>2012-08-24T09:36:06Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:36:06Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0</id> + <updated>2012-08-24T09:37:01Z</updated> + <published>2012-08-24T09:37:01Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:37:01Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0</id> + <updated>2012-08-24T09:38:20Z</updated> + <published>2012-08-24T09:38:20Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T09:38:20Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> + <author> + <name /> + </author> + <updated>2012-08-24T09:40:27Z</updated> + <published>2012-08-24T09:40:27Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T09:40:27Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a04bd349d8964c4fad48ac6ececc60a0.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b321ddccf7d743bf9c67b2664231d14f.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b321ddccf7d743bf9c67b2664231d14f.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b321ddccf7d743bf9c67b2664231d14f.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyVoter free poll (by connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <subtitle>sondage libre dont les votes ne sont visibles que par les participants, créateurs et admin (crée par un utilisateur connecté)</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T09:50:21Z</updated> + <published>2012-08-24T09:50:21Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T09:50:21Z</dc:date> + </entry> + <entry> + <title>New vote from 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:27:30Z</updated> + <published>2012-08-24T12:27:30Z</published> + <summary type="text">Poll result: a=0, b=0</summary> + <dc:creator /> + <dc:date>2012-08-24T12:27:30Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'not connected'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:29:20Z</updated> + <published>2012-08-24T12:29:20Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:29:20Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:29:26Z</updated> + <published>2012-08-24T12:29:26Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:29:26Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f</id> + <updated>2012-08-24T12:31:23Z</updated> + <published>2012-08-24T12:31:23Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T12:31:23Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> + <author> + <name /> + </author> + <updated>2012-08-24T12:34:12Z</updated> + <published>2012-08-24T12:34:12Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T12:34:12Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b321ddccf7d743bf9c67b2664231d14f.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/cacb52f4d49047b7a7aa24ec528fcc87.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/cacb52f4d49047b7a7aa24ec528fcc87.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/cacb52f4d49047b7a7aa24ec528fcc87.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : anonymous free poll (by not connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87" /> + <subtitle>sondage anonyme libre (tout le monde peut voter mais personne ne voit les votes) créé par un utilisateur anonyme</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87</id> + <updated>2012-08-23T22:19:42Z</updated> + <published>2012-08-23T22:19:42Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-23T22:19:42Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87</id> + <updated>2012-08-23T22:20:28Z</updated> + <published>2012-08-23T22:20:28Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-23T22:20:28Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87</id> + <updated>2012-08-23T22:21:23Z</updated> + <published>2012-08-23T22:21:23Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-23T22:21:23Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87" /> + <author> + <name /> + </author> + <updated>2012-08-23T22:22:09Z</updated> + <published>2012-08-23T22:22:09Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-23T22:22:09Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/cacb52f4d49047b7a7aa24ec528fcc87.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e61a350a1d714e479aad526ee85b7bc6.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e61a350a1d714e479aad526ee85b7bc6.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e61a350a1d714e479aad526ee85b7bc6.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : onlyCreator free poll (by not conntected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <subtitle>sondage libre dont les votes ne sont visibles que par le créateur ou un administrateur</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:28:00Z</updated> + <published>2012-08-24T08:28:00Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-24T08:28:00Z</dc:date> + </entry> + <entry> + <title>New vote from 'anonymous vote'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:33:09Z</updated> + <published>2012-08-24T08:33:09Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:33:09Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:42:02Z</updated> + <published>2012-08-24T08:42:02Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:42:02Z</dc:date> + </entry> + <entry> + <title>Delete vote of 'chemit+user@codelutin.com' for reason ''</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:48:37Z</updated> + <published>2012-08-24T08:48:37Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:48:37Z</dc:date> + </entry> + <entry> + <title>New vote from 'chemit+user@codelutin.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:50:58Z</updated> + <published>2012-08-24T08:50:58Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:50:58Z</dc:date> + </entry> + <entry> + <title>New vote from 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6</id> + <updated>2012-08-24T08:54:08Z</updated> + <published>2012-08-24T08:54:08Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-24T08:54:08Z</dc:date> + </entry> + <entry> + <title>Vote modified for 'admin@domain.com'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> + <author> + <name /> + </author> + <updated>2012-08-24T08:54:45Z</updated> + <published>2012-08-24T08:54:45Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-24T08:54:45Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e61a350a1d714e479aad526ee85b7bc6.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/fdd43f4c8d614a9aa48047804583508a.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/fdd43f4c8d614a9aa48047804583508a.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/fdd43f4c8d614a9aa48047804583508a.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : anonymous free poll (by connected user)</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a" /> + <subtitle>sondage anonyme libre (tout le monde peut voter mais personne ne voit les votes) créé par un utilisateur connecté</subtitle> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a</id> + <updated>2012-08-23T22:23:36Z</updated> + <published>2012-08-23T22:23:36Z</published> + <summary type="text" /> + <dc:creator /> + <dc:date>2012-08-23T22:23:36Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a</id> + <updated>2012-08-23T22:24:13Z</updated> + <published>2012-08-23T22:24:13Z</published> + <summary type="text">Poll result: a=1, b=1</summary> + <dc:creator /> + <dc:date>2012-08-23T22:24:13Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a" /> + <author> + <name /> + </author> + <id>http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a</id> + <updated>2012-08-23T22:25:09Z</updated> + <published>2012-08-23T22:25:09Z</published> + <summary type="text">Poll result: a=2, b=1</summary> + <dc:creator /> + <dc:date>2012-08-23T22:25:09Z</dc:date> + </entry> + <entry> + <title>New vote from 'Anonymous voter'</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a" /> + <author> + <name /> + </author> + <updated>2012-08-23T22:26:18Z</updated> + <published>2012-08-23T22:26:18Z</published> + <summary type="text">Poll result: a=2, b=2</summary> + <dc:date>2012-08-23T22:26:18Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/fdd43f4c8d614a9aa48047804583508a.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/it/pollen-ui-it/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollen-ui-it/README.txt =================================================================== --- trunk/pollen-ui-struts2/src/it/pollen-ui-it/README.txt (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollen-ui-it/README.txt 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1 @@ +Pom à utiliser pour tous les tests d'intégrations (contient tout ce qu'il faut) \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/it/pollen-ui-it/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/it/pollen-ui-it/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollen-ui-it/goals.txt =================================================================== --- trunk/pollen-ui-struts2/src/it/pollen-ui-it/goals.txt (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollen-ui-it/goals.txt 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1 @@ +clean install \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/it/pollen-ui-it/goals.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,265 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.4.5-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen.it</groupId> + <artifactId>pollen-ui-it</artifactId> + <name>Pollen :: UI (IT)</name> + <description>Super Pom des ITs</description> + <packaging>pom</packaging> + + <properties> + <defaultWebContextPath>pollen</defaultWebContextPath> + <pollenServerPort>8765</pollenServerPort> + <defaultLogDir>${basedir}/target</defaultLogDir> + + <explodedWarPath>../pollen-ui-it/target/war</explodedWarPath> + </properties> + + <dependencies> + + <dependency> + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-ui-struts2</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-api</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-support</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-chrome-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-firefox-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-ie-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-safari-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-remote-driver</artifactId> + </dependency> + + </dependencies> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + </resource> + </resources> + + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <phase>generate-test-resources</phase> + <configuration> + <tasks> + <copy failonerror="false" overwrite="true" + todir="${project.build.directory}/war/WEB-INF/classes"> + <fileset dir="${basedir}/config/"> + <include name="**/*" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>default-unpack</id> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-ui-struts2</artifactId> + <version>${project.version}</version> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory> + ${project.build.directory}/war + </outputDirectory> + <excludes>**/lib/*.jar</excludes> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> + <webAppConfig> + <contextPath>/${defaultWebContextPath}</contextPath> + </webAppConfig> + <systemProperties> + <systemProperty> + <name>basedir</name> + <value>${basedir}</value> + </systemProperty> + <systemProperty> + <name>pollen.log.dir</name> + <value>${project.build.directory}</value> + </systemProperty> + <systemProperty> + <name>pollenConfigurationFile</name> + <value>pollen-it.properties</value> + </systemProperty> + <systemProperty> + <name>jetty.port</name> + <value>${pollenServerPort}</value> + </systemProperty> + <systemProperty> + <name>pollenServerPort</name> + <value>${pollenServerPort}</value> + </systemProperty> + <systemProperty> + <name>pollenDataDirectory</name> + <value>${project.build.directory}/test-classes/data</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + </build> + + <profiles> + + <profile> + <id>run-it</id> + + <build> + <defaultGoal>post-integration-test</defaultGoal> + <plugins> + + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <executions> + + <execution> + <id>start-pollen</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <daemon>false</daemon> + <webAppSourceDirectory> + ${explodedWarPath} + </webAppSourceDirectory> + <webAppConfig> + <descriptor> + ${explodedWarPath}/WEB-INF/web.xml + </descriptor> + </webAppConfig> + <classesDirectory> + ${explodedWarPath}/WEB-INF/classes + </classesDirectory> + <!--useTestScope>true</useTestScope--> + </configuration> + </execution> + + <execution> + <id>stop-pollen</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <includes> + <include>**/*IT.java</include> + </includes> + <systemPropertyVariables> + <pollenServerPort>${pollenServerPort}</pollenServerPort> + </systemPropertyVariables> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + </profiles> + +</project> Property changes on: trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/config/pollen-it.properties (from rev 3627, trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties) =================================================================== --- trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/config/pollen-it.properties (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/config/pollen-it.properties 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,46 @@ +### +# #%L +# Pollen :: UI (struts2) Test +# $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% +### + +# répertoire des données (injecté via jvm) +pollen.dataDirectory=${pollenDataDirectory} + +# url de l'application +siteUrl=http://localhost:${pollenServerPort}/pollen + +# Db configuration +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:file:${pollen.dataDirectory}/db/pollendb +hibernate.show_sql=false +hibernate.hbm2ddl.auto=update + +# Database migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback +topia.service.migration.showSql=false + +# Version de l'application +pollen.version=${project.version} + Property changes on: trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/config/pollen-it.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/settings.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/settings.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/settings.xml 2012-08-25 18:51:42 UTC (rev 3628) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + EUGene :: Maven plugin + + $Id$ + $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-maven-plugin/src/it/settings.x... $ + %% + Copyright (C) 2006 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser 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 Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<settings> + + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + + <!-- depot des releases nuiton --> + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings> Property changes on: trunk/pollen-ui-struts2/src/it/settings.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-08-24 15:47:45 UTC (rev 3627) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-08-25 18:51:42 UTC (rev 3628) @@ -25,6 +25,7 @@ import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; @@ -174,7 +175,16 @@ * @since 1.4 */ protected PollenConfiguration prepareConfiguration() { - PollenConfiguration configuration = new PollenConfiguration(); + String configurationFile = System.getProperty("pollenConfigurationFile"); + PollenConfiguration configuration; + if (StringUtils.isNotBlank(configurationFile)) { + if (log.isInfoEnabled()) { + log.info("Use specific configuration file : " + configurationFile); + } + configuration = new PollenConfiguration(configurationFile, null); + } else { + configuration = new PollenConfiguration(); + } if (log.isInfoEnabled()) { StringBuilder builder = new StringBuilder(); builder.append("\n-----------------------------------------------------------------------------------------------------"); @@ -183,8 +193,6 @@ builder.append("\n-----------------------------------------------------------------------------------------------------"); log.info(builder.toString()); } - - return configuration; }