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 https://gitlab.nuiton.org/None/pollen_1.x.git commit 6c2b9f8a917c1333c221f22c323f39ab8cf1604e 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>.