Author: fdesbois Date: 2010-04-20 14:30:48 +0000 (Tue, 20 Apr 2010) New Revision: 470 Log: Add assembly configuration for embedded version Added: trunk/wao-ui/src/main/assembly/ trunk/wao-ui/src/main/assembly/Wao.properties trunk/wao-ui/src/main/assembly/bin.xml trunk/wao-ui/src/main/assembly/go.bat Modified: trunk/README.txt trunk/wao-ui/README.txt trunk/wao-ui/pom.xml Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2010-04-20 09:54:30 UTC (rev 469) +++ trunk/README.txt 2010-04-20 14:30:48 UTC (rev 470) @@ -1,10 +1,12 @@ Launch application with winstone -------------------------------- -java -jar suiviobsmer-XXX.war +java -jar wao-xxx.war -Note : chargement un peu long... +ou +lancement à partir du script go.bat (pour Windows) + Default admin user ------------------ @@ -19,5 +21,11 @@ Configuration au lancement -------------------------- --Dconfig.path=/path/to/properties/file (file named Wao.properties) +-Dwao.config.path=/path/to/properties/file (file named Wao.properties) -Dwao.log.home=/path/to/log/folder + +Liens +----- + +Site du projet : https://labs.libre-entreprise.org/projects/suiviobsmer/ +Site de documentation : http://suiviobsmer.labs.libre-entreprise.org/wao/ Modified: trunk/wao-ui/README.txt =================================================================== --- trunk/wao-ui/README.txt 2010-04-20 09:54:30 UTC (rev 469) +++ trunk/wao-ui/README.txt 2010-04-20 14:30:48 UTC (rev 470) @@ -1,11 +1,31 @@ Launch application with winstone -------------------------------- -java -jar suiviobsmer-XXX.war +java -jar wao-xxx.war +ou + +lancement à partir du script go.bat (pour Windows) + Default admin user ------------------ login = admin -passwor = password +password = password +Format des fichiers en CSV +-------------------------- + +Encodage UTF-8 obligatoire. Préconisation d'OpenOffice pour la sauvegarde des fichiers. + +Configuration au lancement +-------------------------- + +-Dwao.config.path=/path/to/properties/file (file named Wao.properties) +-Dwao.log.home=/path/to/log/folder + +Liens +----- + +Site du projet : https://labs.libre-entreprise.org/projects/suiviobsmer/ +Site de documentation : http://suiviobsmer.labs.libre-entreprise.org/wao/ Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-04-20 09:54:30 UTC (rev 469) +++ trunk/wao-ui/pom.xml 2010-04-20 14:30:48 UTC (rev 470) @@ -170,7 +170,39 @@ </plugins> </build> - + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>wao-${project.version}</finalName> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <repositories> <!-- Repository for fckeditor component needed for News page --> Added: trunk/wao-ui/src/main/assembly/Wao.properties =================================================================== --- trunk/wao-ui/src/main/assembly/Wao.properties (rev 0) +++ trunk/wao-ui/src/main/assembly/Wao.properties 2010-04-20 14:30:48 UTC (rev 470) @@ -0,0 +1,2 @@ +hibernate.hbm2ddl.auto=update + Property changes on: trunk/wao-ui/src/main/assembly/Wao.properties ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-ui/src/main/assembly/bin.xml =================================================================== --- trunk/wao-ui/src/main/assembly/bin.xml (rev 0) +++ trunk/wao-ui/src/main/assembly/bin.xml 2010-04-20 14:30:48 UTC (rev 470) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly 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/assembly-1.1.1.xsd"> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <files> + <file> + <source>target/${project.build.finalName}.${project.packaging}</source> + <destName>wao.${project.packaging}</destName> + </file> + <file> + <source>src/main/assembly/Wao.properties</source> + </file> + <file> + <source>src/main/assembly/go.bat</source> + <fileMode>0755</fileMode> + </file> + </files> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: trunk/wao-ui/src/main/assembly/bin.xml ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/wao-ui/src/main/assembly/go.bat =================================================================== --- trunk/wao-ui/src/main/assembly/go.bat (rev 0) +++ trunk/wao-ui/src/main/assembly/go.bat 2010-04-20 14:30:48 UTC (rev 470) @@ -0,0 +1 @@ +java -Xmx512m -jar -Dwao.log.home=${user.home}/.local/wao/logs -Dwao.config.path=. wao.war > wao-console.log