Author: tchemit Date: 2012-05-01 18:30:50 +0200 (Tue, 01 May 2012) New Revision: 3335 Url: http://chorem.org/repositories/revision/pollen/3335 Log: refs #538: Improve install documentation Added: trunk/pollen-ui-struts2/src/main/site/ trunk/pollen-ui-struts2/src/main/site/fr/ trunk/pollen-ui-struts2/src/main/site/fr/rst/ trunk/pollen-ui-struts2/src/main/site/fr/rst/index.rst trunk/pollen-ui-struts2/src/main/site/rst/ trunk/pollen-ui-struts2/src/main/site/rst/index.rst trunk/pollen-ui-struts2/src/main/site/site_en.xml trunk/pollen-ui-struts2/src/main/site/site_fr.xml Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/assembly/bin.xml trunk/pollen-ui-struts2/src/main/assembly/dist/README.txt trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-01 15:40:34 UTC (rev 3334) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-01 16:30:50 UTC (rev 3335) @@ -282,33 +282,6 @@ <uriEncoding>UTF-8</uriEncoding> </configuration> </plugin> - - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-web</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-runner</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - </plugins> </pluginManagement> </build> @@ -327,6 +300,40 @@ <defaultGoal>verify</defaultGoal> <plugins> <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>embedded-war</id> + <goals> + <goal>war</goal> + </goals> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + <warName>pollen-embedded-${project.version}.war</warName> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> Modified: trunk/pollen-ui-struts2/src/main/assembly/bin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-05-01 15:40:34 UTC (rev 3334) +++ trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-05-01 16:30:50 UTC (rev 3335) @@ -1,3 +1,26 @@ +<!-- + #%L + Pollen :: UI (struts2) + + $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% + --> <assembly> <id>bin</id> <formats> @@ -3,10 +26,4 @@ <format>zip</format> </formats> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <scope>runtime</scope> - </dependencySet> - </dependencySets> <fileSets> Property changes on: trunk/pollen-ui-struts2/src/main/assembly/bin.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/assembly/dist/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-01 15:40:34 UTC (rev 3334) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat 2012-05-01 16:30:50 UTC (rev 3335) @@ -40,7 +40,7 @@ set POLLEN_OPTS="-Xms512m -Xmx1024m -pollen.log.dir=./logs" echo java options used : %POLLEN_OPTS% -%JAVA_COMMAND% "%POLLEN_OPTS%" -jar ${project.build.finalName}.war +%JAVA_COMMAND% "%POLLEN_OPTS%" -jar pollen-embedded-${project.version}.war goto end :end Property changes on: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties 2012-05-01 15:40:34 UTC (rev 3334) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties 2012-05-01 16:30:50 UTC (rev 3335) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: UI (struts2) +# +# $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% +### # # Pollen - v ${project.version} Configuration # Property changes on: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-05-01 15:40:34 UTC (rev 3334) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh 2012-05-01 16:30:50 UTC (rev 3335) @@ -9,5 +9,5 @@ cd `dirname $0` CURRENTPWD=`pwd` POLLEN_OPTS="$JAVA_OPTS -Xms512m -Xmx10242m -pollen.log.dir=$CURRENTPWD/logs" -java $POLLEN_OPTS -jar ${project.build.finalName}.war $* +java $POLLEN_OPTS -jar pollen-embedded-${project.version}.war $* cd "$OLDPWD" \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-05-01 15:40:34 UTC (rev 3334) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-05-01 16:30:50 UTC (rev 3335) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.ui.actions.user; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.exceptions.UserNotFoundException; Added: trunk/pollen-ui-struts2/src/main/site/fr/rst/index.rst =================================================================== --- trunk/pollen-ui-struts2/src/main/site/fr/rst/index.rst (rev 0) +++ trunk/pollen-ui-struts2/src/main/site/fr/rst/index.rst 2012-05-01 16:30:50 UTC (rev 3335) @@ -0,0 +1,28 @@ +.. - +.. * #%L +.. * Pollen :: UI (struts2) +.. * +.. * $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% +.. - +Welcome to Pollen website +------------------------- + +Pollen is web based poll/vote application. It is aimed to small entities that +want to have a way to manage votes without giving their data to someone. Property changes on: trunk/pollen-ui-struts2/src/main/site/fr/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/main/site/rst/index.rst =================================================================== --- trunk/pollen-ui-struts2/src/main/site/rst/index.rst (rev 0) +++ trunk/pollen-ui-struts2/src/main/site/rst/index.rst 2012-05-01 16:30:50 UTC (rev 3335) @@ -0,0 +1,30 @@ +.. - +.. * #%L +.. * Pollen :: UI (struts2) +.. * +.. * $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% +.. - + +Pollen UI +--------- + +Pollen est une application de consultation web. Elle est destinée aux petites entités +qui veulent un moyen simple de gérer des consultations tout en restant maître de leurs +données. Property changes on: trunk/pollen-ui-struts2/src/main/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/main/site/site_en.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/site/site_en.xml (rev 0) +++ trunk/pollen-ui-struts2/src/main/site/site_en.xml 2012-05-01 16:30:50 UTC (rev 3335) @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen + + $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% + --> + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + <item name="Configuration" href="./application-config-report.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu name="Download"> + <item name="Download" + href="http://www.chorem.org/projects/pollen/files"/> + </menu> + + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-ui-struts2/src/main/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/main/site/site_fr.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/site/site_fr.xml (rev 0) +++ trunk/pollen-ui-struts2/src/main/site/site_fr.xml 2012-05-01 16:30:50 UTC (rev 3335) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen + + $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% + --> + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + <item name="Configuration" href="./application-config-report.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu name="Téléchargement"> + <item name="Téléchargement" + href="http://www.chorem.org/projects/pollen/files"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-ui-struts2/src/main/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native