Author: tchemit Date: 2008-12-05 14:24:37 +0000 (Fri, 05 Dec 2008) New Revision: 1276 Added: lutini18neditor/trunk/README lutini18neditor/trunk/src/main/assembly/ lutini18neditor/trunk/src/main/assembly/bin.xml lutini18neditor/trunk/src/main/assembly/go.bat lutini18neditor/trunk/src/main/assembly/go.sh lutini18neditor/trunk/src/main/jnlp/ lutini18neditor/trunk/src/main/jnlp/jxlayer.jnlp lutini18neditor/trunk/src/main/jnlp/sun.jnlp lutini18neditor/trunk/src/site/ lutini18neditor/trunk/src/site/fr/ lutini18neditor/trunk/src/site/fr/rst/ lutini18neditor/trunk/src/site/fr/rst/Todo.rst lutini18neditor/trunk/src/site/fr/rst/images/ lutini18neditor/trunk/src/site/fr/rst/images/webstart.gif lutini18neditor/trunk/src/site/fr/rst/index.rst lutini18neditor/trunk/src/site/site.xml Modified: lutini18neditor/trunk/ lutini18neditor/trunk/changelog lutini18neditor/trunk/pom.xml Log: passage en lutinproject 3.2 + site minimal + bundles (zip and webstart) de release Property changes on: lutini18neditor/trunk ___________________________________________________________________ Name: svn:ignore - target .project .classpath + target .project .classpath *.log Added: lutini18neditor/trunk/README =================================================================== --- lutini18neditor/trunk/README (rev 0) +++ lutini18neditor/trunk/README 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install Modified: lutini18neditor/trunk/changelog =================================================================== --- lutini18neditor/trunk/changelog 2008-12-05 13:37:42 UTC (rev 1275) +++ lutini18neditor/trunk/changelog 2008-12-05 14:24:37 UTC (rev 1276) @@ -1,7 +1,7 @@ -0.4 2008???? [???] +0.3 ?? 2008???? + * 20081205 [chemit] use lutinproject 3.2, make minimal site * 20081118 [chemit] use lutinproject 3.1, produce javadoc * 20081117 [chemit] bump jaxx to 0.6 -0.3 * use src/main/java to store jaxx, no more use of uimodel directory * Update groupId to org.codelutin * Use org.codelutin:lutinproject:3.0 super-pom \ No newline at end of file Modified: lutini18neditor/trunk/pom.xml =================================================================== --- lutini18neditor/trunk/pom.xml 2008-12-05 13:37:42 UTC (rev 1275) +++ lutini18neditor/trunk/pom.xml 2008-12-05 14:24:37 UTC (rev 1276) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.1</version> + <version>3.2</version> </parent> <artifactId>lutini18neditor</artifactId> @@ -68,6 +68,12 @@ <!-- main class in jar --> <maven.jar.main.class>org.codelutin.i18n.editor.I18nEditor</maven.jar.main.class> + + <!-- jnlp --> + <keystorepath>${codelutin.keystorepath}</keystorepath> + <keystorealias>CodeLutin</keystorealias> + <keystorepass>codelutin</keystorepass> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> </properties> @@ -111,20 +117,17 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <configuration> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + <plugin> <artifactId>maven-javadoc-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -136,6 +139,25 @@ </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> @@ -150,4 +172,145 @@ <url>${maven.scm.url}</url> </scm> + <profiles> + <profile> + <id>jnlp</id> + <activation> + <!-- by default jnlp is created, use -DdoJnlp=false to disable this build (for dev...)--> + <property> + <name>doJnlp</name> + <value>!false</value> + </property> + </activation> + <build> + <plugins> + <plugin> + + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> + <execution> + <id>JnlpSun</id> + <phase>compile</phase> + <configuration> + <tasks> + <mkdir dir="${jnlp.build.directory}"/> + <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" + verbose="${maven.verbose}" + todir="${jnlp.build.directory}" failonerror="false"> + <filterset> + <filter token="lib" value="javahelp-2.0.02.jar"/> + <filter token="url" value="${project.url}"/> + </filterset> + </copy> + <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" + verbose="${maven.verbose}" + todir="${jnlp.build.directory}" failonerror="false"> + <filterset> + <filter token="lib" value="jxlayer-3.0.1.jar"/> + <filter token="url" value="${project.url}"/> + </filterset> + </copy> + <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" + verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" + failonerror="false"/> + <copy file="${project.build.directory}/lib/jxlayer-3.0.1.jar" + verbose="${maven.verbose}" + todir="${jnlp.build.directory}/lib" failonerror="false"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>JnlpToSite</id> + <phase>pre-site</phase> + <configuration> + <tasks> + <mkdir dir="${maven.site.gen.dir}/resources"/> + <!--copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}"--> + <copy todir="${maven.site.gen.dir}/resources" verbose="true" + failonerror="false" overwrite="false"> + <fileset dir="${jnlp.build.directory}"> + <include name="**"/> + </fileset> + <fileset dir="target"> + <include name="${project.build.finalName}-bin.zip"/> + </fileset> + + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20081018</version> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + <configuration> + <force>false</force> + <dependencies> + <excludes> + <exclude>javax.help:javahelp</exclude> + <exclude>org.swinglabs:jxlayer</exclude> + </excludes> + </dependencies> + <libPath>lib</libPath> + <extensions> + <sun>sun.jnlp</sun> + <jxlayer>jxlayer.jnlp</jxlayer> + </extensions> + <jnlp> + <outputFile>launch-${project.artifactId}.jnlp</outputFile> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + + <sign> + <keystore>${keystorepath}</keystore> + <keypass/> + <storepass>${keystorepass}</storepass> + <storetype/> + <alias>${keystorealias}</alias> + <validity/> + <dnameCn/> + <dnameOu/> + <dnameO/> + <dnameL/> + <dnameSt/> + <dnameC/> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + + + <pack200>false</pack200> + <gzip>true</gzip> + <verbose>false</verbose> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> Added: lutini18neditor/trunk/src/main/assembly/bin.xml =================================================================== --- lutini18neditor/trunk/src/main/assembly/bin.xml (rev 0) +++ lutini18neditor/trunk/src/main/assembly/bin.xml 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,53 @@ +<assembly> + <id>bin</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + + <fileSet> + <directory>target/lib</directory> + <outputDirectory>lutini18nEditor/lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>junit-4.5.jar</exclude> + </excludes> + </fileSet> + + <fileSet> + <directory>target</directory> + <outputDirectory>lutini18nEditor</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*-sources.jar</exclude> + <exclude>*-javadoc.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <outputDirectory>lutini18nEditor</outputDirectory> + + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly</directory> + <filtered>true</filtered> + <outputDirectory>lutini18nEditor</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>go.sh</include> + <include>go.bat</include> + </includes> + </fileSet> + + </fileSets> +</assembly> \ No newline at end of file Added: lutini18neditor/trunk/src/main/assembly/go.bat =================================================================== --- lutini18neditor/trunk/src/main/assembly/go.bat (rev 0) +++ lutini18neditor/trunk/src/main/assembly/go.bat 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1 @@ +java -Xmx512M -Xms512M -jar ${project.build.finalName}.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file Added: lutini18neditor/trunk/src/main/assembly/go.sh =================================================================== --- lutini18neditor/trunk/src/main/assembly/go.sh (rev 0) +++ lutini18neditor/trunk/src/main/assembly/go.sh 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,4 @@ +#!/bin/sh + +MX=512M +java -Xmx$MX -Xms$MX -jar ${project.build.finalName}.jar "$@" \ No newline at end of file Added: lutini18neditor/trunk/src/main/jnlp/jxlayer.jnlp =================================================================== --- lutini18neditor/trunk/src/main/jnlp/jxlayer.jnlp (rev 0) +++ lutini18neditor/trunk/src/main/jnlp/jxlayer.jnlp 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="@url@" href="jxlayer.jnlp"> + <information> + <title>Swing X</title> + <vendor>Swing X</vendor> + <offline-allowed/> + </information> + <resources> + <jar href="lib/@lib@"/> + </resources> + <component-desc/> +</jnlp> \ No newline at end of file Added: lutini18neditor/trunk/src/main/jnlp/sun.jnlp =================================================================== --- lutini18neditor/trunk/src/main/jnlp/sun.jnlp (rev 0) +++ lutini18neditor/trunk/src/main/jnlp/sun.jnlp 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<jnlp spec="1.0+" codebase="@url@" href="sun.jnlp"> + <information> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <offline-allowed/> + </information> + <resources> + <jar href="lib/@lib@"/> + </resources> + <component-desc/> +</jnlp> \ No newline at end of file Added: lutini18neditor/trunk/src/site/fr/rst/Todo.rst =================================================================== --- lutini18neditor/trunk/src/site/fr/rst/Todo.rst (rev 0) +++ lutini18neditor/trunk/src/site/fr/rst/Todo.rst 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,2 @@ +TODO +==== Added: lutini18neditor/trunk/src/site/fr/rst/images/webstart.gif =================================================================== (Binary files differ) Property changes on: lutini18neditor/trunk/src/site/fr/rst/images/webstart.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: lutini18neditor/trunk/src/site/fr/rst/index.rst =================================================================== --- lutini18neditor/trunk/src/site/fr/rst/index.rst (rev 0) +++ lutini18neditor/trunk/src/site/fr/rst/index.rst 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,33 @@ +LutinI18nEditor +=============== + +.. contents:: + + +Présentation +------------ + +Application swing pour éditer des bundles i18n. + +Set it in action from Web +------------------------- + +|webstart| + +To run this application in `Java Web Start`_, click the `following link`_. + +Actually does not work very well, prefer use the zip version... + + +Set it in action from Zip +------------------------- + +You can download at the section download the zip file, extract it and then launch *go.sh* or *go.bat*. + + +.. _Java Web Start: http://java.sun.com/products/javawebstart/ + +.. |webstart| image:: images/webstart.gif + +.. _following link: ./launch-lutini18neditor.jnlp + Added: lutini18neditor/trunk/src/site/site.xml =================================================================== --- lutini18neditor/trunk/src/site/site.xml (rev 0) +++ lutini18neditor/trunk/src/site/site.xml 2008-12-05 14:24:37 UTC (rev 1276) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.1</version> + </skin> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item href="launch-${project.artifactId}.jnlp" + src="images/webstart.gif" + name="Démarrer la dernière version"/> + <item href="${project.build.finalName}-bin.zip" + name="Télécharger la dernière version"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + </body> +</project>