branch pollen-udpate-1.6 updated (12a68bb -> 14ec9d2)
This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 12a68bb Update jfreechart new 8c1a569 Strange: all migration queries are not working :( new 3dd4b09 Fix : char in uri (struts update) new 0ae534a Fix jetty config for integration tests new b6d29d7 Fix struts internal change related to action button new 14ec9d2 Never in update mode The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 14ec9d22b6a535930ae0c5ae71bb5e161aa46589 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:56:06 2015 +0100 Never in update mode commit b6d29d7e92d18f933b462b64504e1ccb3268d94a Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:55:51 2015 +0100 Fix struts internal change related to action button commit 0ae534a60da574fd179249b1a3e66ced9046ffe7 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:55:19 2015 +0100 Fix jetty config for integration tests commit 3dd4b096cc87424d3a2dff07311cd4effce0fb96 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:53:00 2015 +0100 Fix : char in uri (struts update) commit 8c1a5697a936c0e334228c7893fd52fe52cacc11 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 18:36:45 2015 +0100 Strange: all migration queries are not working :( Summary of changes: .../migration/PollenMigrationCallbackV1_5.java | 2 +- .../src/it/createPoll/src/jetty/jetty-context.xml | 32 ---------------------- .../src/jetty/jetty-context.xml | 32 ---------------------- .../pollVoteVisibility/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 3 +- .../src/it/security/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/main/resources/struts.xml | 3 ++ .../org/chorem/pollen/ui/it/AbstractPollenIT.java | 2 +- .../src/test/resources/pollen-it.properties | 2 +- 10 files changed, 7 insertions(+), 165 deletions(-) delete mode 100644 pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml delete mode 100644 pollen-ui-struts2/src/jetty/jetty-context.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 8c1a5697a936c0e334228c7893fd52fe52cacc11 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 18:36:45 2015 +0100 Strange: all migration queries are not working :( --- .../chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java index 83c1fbd..b39b07f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java @@ -130,7 +130,7 @@ public class PollenMigrationCallbackV1_5 extends TopiaMigrationCallbackByClassNG protected PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement ps = connection.prepareStatement( "SELECT p.pollid FROM poll p WHERE " + - "(SELECT COUNT(pa) > COUNT(DISTINCT(pa.useraccount)) " + + "(SELECT COUNT(pa.*) > COUNT(DISTINCT(pa.useraccount)) " + "FROM vote v,pollaccount pa WHERE " + "v.poll = p.topiaid AND v.pollaccount = pa.topiaid " + "AND pa.useraccount IS NOT NULL);"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 3dd4b096cc87424d3a2dff07311cd4effce0fb96 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:53:00 2015 +0100 Fix : char in uri (struts update) --- pollen-ui-struts2/src/main/resources/struts.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pollen-ui-struts2/src/main/resources/struts.xml b/pollen-ui-struts2/src/main/resources/struts.xml index e030b52..9537442 100644 --- a/pollen-ui-struts2/src/main/resources/struts.xml +++ b/pollen-ui-struts2/src/main/resources/struts.xml @@ -46,6 +46,9 @@ <constant name="struts.multipart.maxSize" value="209715200"/> <constant name="struts.enable.SlashesInActionNames" value="true"/> <constant name="struts.devMode" value="false"/> + + <!-- Since 1.6, struts doesn't allow : in uri (used for security token) + <constant name="struts.allowed.action.names" value="[a-zA-Z0-9._!/\-:]*"/> <!-- See voir http://struts.apache.org/release/2.3.x/docs/s2-019.html --> <!--<constant name="struts.enable.DynamicMethodInvocation" value="true"/>--> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 0ae534a60da574fd179249b1a3e66ced9046ffe7 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:55:19 2015 +0100 Fix jetty config for integration tests --- .../src/it/createPoll/src/jetty/jetty-context.xml | 32 ---------------------- .../src/jetty/jetty-context.xml | 32 ---------------------- .../pollVoteVisibility/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/it/pollen-ui-it/pom.xml | 3 +- .../src/it/security/src/jetty/jetty-context.xml | 32 ---------------------- pollen-ui-struts2/src/jetty/jetty-context.xml | 32 ---------------------- 6 files changed, 1 insertion(+), 162 deletions(-) diff --git a/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/createPoll/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - 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 "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.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 diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - 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 "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.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 diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - 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 "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.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 diff --git a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml index 35e616f..a6ace8a 100644 --- a/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml +++ b/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml @@ -253,7 +253,6 @@ <configuration> <stopKey>A</stopKey> <stopPort>1269</stopPort> - <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> <webAppConfig> <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> @@ -332,7 +331,7 @@ <id>start-pollen</id> <phase>pre-integration-test</phase> <goals> - <goal>run</goal> + <goal>start</goal> </goals> <configuration> <!--<daemon>true</daemon>--> diff --git a/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/it/security/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - 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 "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.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 diff --git a/pollen-ui-struts2/src/jetty/jetty-context.xml b/pollen-ui-struts2/src/jetty/jetty-context.xml deleted file mode 100644 index 0126ae4..0000000 --- a/pollen-ui-struts2/src/jetty/jetty-context.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Pollen :: UI (struts2) - $Id$ - $HeadURL$ - %% - 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 "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.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 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit b6d29d7e92d18f933b462b64504e1ccb3268d94a Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:55:51 2015 +0100 Fix struts internal change related to action button --- .../src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java index da22450..4cd5d75 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java @@ -176,7 +176,7 @@ public abstract class AbstractPollenIT { Assert.assertEquals("input", passwordElement.getTagName()); passwordElement.sendKeys(password); - WebElement submit = findElement(By.name("action:login")); + WebElement submit = findElement(By.name("pollen.action.login")); submit.click(); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 14ec9d22b6a535930ae0c5ae71bb5e161aa46589 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 21:56:06 2015 +0100 Never in update mode --- pollen-ui-struts2/src/test/resources/pollen-it.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-struts2/src/test/resources/pollen-it.properties b/pollen-ui-struts2/src/test/resources/pollen-it.properties index 42c5ec6..7fd0587 100644 --- a/pollen-ui-struts2/src/test/resources/pollen-it.properties +++ b/pollen-ui-struts2/src/test/resources/pollen-it.properties @@ -34,7 +34,7 @@ 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 +hibernate.hbm2ddl.auto=none hibernate.c3p0.min_size=5 hibernate.c3p0.max_size=20 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm