Author: tchemit Date: 2009-11-03 20:50:55 +0100 (Tue, 03 Nov 2009) New Revision: 2723 Modified: trunk/lima-main/pom.xml trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties Log: use webstart + update pom to be conformed to mavenpom 1.1.0 Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2009-11-03 18:08:19 UTC (rev 2722) +++ trunk/lima-main/pom.xml 2009-11-03 19:50:55 UTC (rev 2723) @@ -1,5 +1,6 @@ <?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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <!-- ************************************************************* --> @@ -44,7 +45,7 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> @@ -112,16 +113,10 @@ <!-- jaxx configuration --> <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - + <!--Main class in JAR --> <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> - <!-- jnlp --> - <keystorepath>${codelutin.keystorepath}</keystorepath> - <keystorealias>${codelutin.keystorealias}</keystorealias> - <keystorepass>${codelutin.keystorepass}</keystorepass> - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - <jnlpCodebase>${project.url}</jnlpCodebase> </properties> <packaging>jar</packaging> @@ -161,6 +156,20 @@ <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>add-license</goal> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> <executions> @@ -200,19 +209,25 @@ <executions> <execution> <id>copy-dependencies</id> - <configuration> - <silent>true</silent> - </configuration> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + </configuration> </execution> - </executions> - </plugin> </plugins> <pluginManagement> <plugins> + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -224,14 +239,58 @@ </archive> </configuration> </plugin> + + <!--plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <jnlpExtensions> + <jnlpExtension> + <name>sun</name> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> + <includes> + <include>javax.help:javahelp</include> + </includes> + </jnlpExtension> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer</title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + </jnlpExtensions> + </configuration> + </plugin--> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> + <copyToMETA_INF>true</copyToMETA_INF> + </configuration> + </plugin> + </plugins> </pluginManagement> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + </plugin> + </plugins> + </reporting> + <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* --> - + <profiles> <profile> <id>release-profile</id> @@ -243,7 +302,29 @@ </activation> <build> <plugins> + <!-- key store secrets availables --> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptors> @@ -260,6 +341,21 @@ </execution> </executions> </plugin> + + <!-- make webstart --> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> </profile> Modified: trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties =================================================================== --- trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-11-03 18:08:19 UTC (rev 2722) +++ trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-11-03 19:50:55 UTC (rev 2723) @@ -12,11 +12,11 @@ lima.action.unconnect=D\u00E9connecter lima.action.unconnect.help=Aide lima.action.unconnect.tooltip=tooltip -lima.add=Ajouter +lima.add= lima.add.account=Ajouter un compte lima.add.entry=Ajouter une entr\u00E9e lima.add.lettering=Ajouter une lettre -lima.add.transaction=Ajouter une transaction +lima.add.transaction= lima.all=Tous lima.all.criteria=Tous les crit\u00E8res correspondent lima.amount=Montant