Author: echatellier Date: 2009-12-17 12:36:15 +0100 (Thu, 17 Dec 2009) New Revision: 2827 Removed: trunk/pollen-ui/src/main/java/org/chorem/pollen/war/ trunk/pollen-ui/src/main/resources/pollenembedded.properties Modified: trunk/changelog.txt trunk/pollen-business/pom.xml trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Log: Use nuiton-utils war launcher, update pom xsd Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-12-17 11:31:57 UTC (rev 2826) +++ trunk/changelog.txt 2009-12-17 11:36:15 UTC (rev 2827) @@ -1,6 +1,13 @@ ChangeLog ========= +1.2.2 +- Rename favicon to favicon.png +- Use war launcher from nuiton-utils project + +1.2.1 +- Erreur lors de la modification de son vote Issue: 87 + 1.2.0 - Fixed a performance problem in the file upload with Winstone. - Global dependencies update Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2009-12-17 11:31:57 UTC (rev 2826) +++ trunk/pollen-business/pom.xml 2009-12-17 11:36:15 UTC (rev 2827) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2009-12-17 11:31:57 UTC (rev 2826) +++ trunk/pollen-ui/pom.xml 2009-12-17 11:36:15 UTC (rev 2827) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -71,6 +71,10 @@ <artifactId>junit</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> <groupId>org.jvnet.hudson.winstone</groupId> <artifactId>winstone</artifactId> <scope>provided</scope> @@ -119,27 +123,26 @@ <artifactId>maven-war-plugin</artifactId> <version>2.1-beta-1</version> <configuration> - <webResources> - <resource> - <directory>${basedir}/target/classes</directory> - <includes> - <include>**/war/*</include> - </includes> - </resource> - </webResources> - <!-- for putting Main-Class into war --> <archive> <manifest> - <mainClass>org.chorem.pollen.war.PollenWarLauncher</mainClass> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> </manifest> </archive> <overlays> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> </configuration> </plugin> </plugins> Deleted: trunk/pollen-ui/src/main/resources/pollenembedded.properties =================================================================== --- trunk/pollen-ui/src/main/resources/pollenembedded.properties 2009-12-17 11:31:57 UTC (rev 2826) +++ trunk/pollen-ui/src/main/resources/pollenembedded.properties 2009-12-17 11:36:15 UTC (rev 2827) @@ -1,47 +0,0 @@ -##�Properties file for embedded winstone war - -## Configuration de la base de données -#hibernate.hbm2ddl.auto=update -hibernate.show_sql=false -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:pollendata/pollen - -## Configuration de topia-migration -topia.service.migration=org.nuiton.topia.migration.TopiaMigrationServiceImpl -topia.service.migration.callbackhandlers=org.chorem.pollen.business.migration.PollenMigrationCallbackHandler -topia.service.migration.mappingsdir=oldmappings -topia.service.migration.modelnames=pollen - -## Initialisation de la base de données -choiceType=DATE,IMAGE,TEXT -pollType=RESTRICTED,FREE,GROUP -voteCounting=NORMAL,PERCENTAGE,CONDORCET - -## Utilisateur par défaut -adminLogin=admin -adminPassword=pollen -adminEmail=admin@domain.com - -## Répertoire des images transférées -upImgDir=pollendata/uploadedImages - -## Taille maximal des images transférées (en octets) -upload.filesize-max=1048576 -upload.requestsize-max=10485760 - -## Configuration de l'envoi d'emails automatiques -email_host=smtp.free.fr -email_port=25 -email_from=bot@pollen.org - -## Répertoire des flux de syndication (Atom) -feedDir=pollendata/feeds - -## Adresse du site (utilisée pour les emails de rappel) -siteUrl= - -## Version de l'application -version=${project.version} \ No newline at end of file Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2009-12-17 11:31:57 UTC (rev 2826) +++ trunk/pollen-votecounting/pom.xml 2009-12-17 11:36:15 UTC (rev 2827) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-17 11:31:57 UTC (rev 2826) +++ trunk/pom.xml 2009-12-17 11:36:15 UTC (rev 2827) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -44,7 +44,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>1.1.1</version> + <version>1.1.2-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton.topia</groupId>