Author: tchemit Date: 2009-02-05 17:52:42 +0000 (Thu, 05 Feb 2009) New Revision: 1328 Modified: lutini18neditor/trunk/changelog.txt lutini18neditor/trunk/pom.xml Log: passage en lutinpluginproject:3.4-SNAPSHOT Modified: lutini18neditor/trunk/changelog.txt =================================================================== --- lutini18neditor/trunk/changelog.txt 2009-02-05 17:16:14 UTC (rev 1327) +++ lutini18neditor/trunk/changelog.txt 2009-02-05 17:52:42 UTC (rev 1328) @@ -1,5 +1,5 @@ 0.3 ?? 2008???? - * 20090111 [chemit] use lutinproject 3.3 + * 20090205 [chemit] use lutinproject 3.4, improve jnlp making * 20081205 [chemit] use lutinproject 3.2, make minimal site * 20081118 [chemit] use lutinproject 3.1, produce javadoc * 20081117 [chemit] bump jaxx to 0.6 Modified: lutini18neditor/trunk/pom.xml =================================================================== --- lutini18neditor/trunk/pom.xml 2009-02-05 17:16:14 UTC (rev 1327) +++ lutini18neditor/trunk/pom.xml 2009-02-05 17:52:42 UTC (rev 1328) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <artifactId>lutini18neditor</artifactId> @@ -60,21 +60,19 @@ <!-- nom du projet sur le labs --> <labs.project>lutinutil</labs.project> - <!-- jaxx version --> - <!--jaxx.version>0.6</jaxx.version--> - - <!-- lutinutil version --> - <!--lutinutil.version>1.0-SNAPSHOT</lutinutil.version--> - <!-- main class in jar --> <maven.jar.main.class>org.codelutin.i18n.editor.I18nEditor</maven.jar.main.class> + <jaxx.version>1.1-SNAPSHOT</jaxx.version> + <!-- jnlp --> <keystorepath>${codelutin.keystorepath}</keystorepath> <keystorealias>CodeLutin</keystorealias> <keystorepass>codelutin</keystorepass> <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - + <jnlpCodebase>${project.url}</jnlpCodebase> + <!-- to test jnlp file locally --> + <!--jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase--> </properties> <build> @@ -83,6 +81,7 @@ <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> <executions> <execution> <goals> @@ -92,22 +91,33 @@ </executions> </plugin> + <!-- plugin i18n --> <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + <configuration> + <bundles> + <param>fr_FR</param> + <param>en_GB</param> + </bundles> + <encoding>${maven.compile.encoding}</encoding> + <src>${maven.src.dir}/main/resources/i18n</src> + <defaultBasedir>${maven.src.dir}/main/java</defaultBasedir> + <keysModifier>false</keysModifier> + <keepBackup>false</keepBackup> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> <executions> <execution> <goals> <goal>parserJava</goal> <goal>gen</goal> </goals> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> </execution> </executions> </plugin> @@ -117,21 +127,30 @@ <configuration> <outputDirectory>${project.build.directory}/lib</outputDirectory> </configuration> + <executions> + <execution> + <id>copy-dependencies</id> + </execution> + </executions> </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> + </plugins> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <!-- ************************************************************* --> @@ -163,7 +182,7 @@ <!-- Ajout des libs signe par Sun dans un fichier jnlp separe --> <execution> <id>JnlpSun</id> - <phase>compile</phase> + <phase>verify</phase> <configuration> <tasks> <mkdir dir="${jnlp.build.directory}"/> @@ -172,7 +191,7 @@ todir="${jnlp.build.directory}" failonerror="false"> <filterset> <filter token="lib" value="javahelp-2.0.02.jar"/> - <filter token="url" value="${project.url}"/> + <filter token="url" value="${jnlpCodebase}"/> </filterset> </copy> <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" @@ -180,7 +199,7 @@ todir="${jnlp.build.directory}" failonerror="false"> <filterset> <filter token="lib" value="jxlayer-3.0.1.jar"/> - <filter token="url" value="${project.url}"/> + <filter token="url" value="${jnlpCodebase}"/> </filterset> </copy> <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" @@ -240,11 +259,11 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20081018</version> + <version>1.0-alpha-2-cl_20090204</version> <executions> <execution> <phase>verify</phase>