November 2009 - Lima-commits - mailman.cloud.codelutin.com

r2724 - in trunk: . lima-main lima-main/src/main/assembly src/site
by tchemit＠users.chorem.org 04 Nov '09

04 Nov '09

Author: tchemit Date: 2009-11-04 15:36:03 +0100 (Wed, 04 Nov 2009) New Revision: 2724 Modified: trunk/lima-main/pom.xml trunk/lima-main/src/main/assembly/bin.xml trunk/pom.xml trunk/src/site/site_fr.xml Log: do not attach include artifacts in redmine release Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2009-11-03 19:50:55 UTC (rev 2723) +++ trunk/lima-main/pom.xml 2009-11-04 14:36:03 UTC (rev 2724) @@ -117,6 +117,7 @@  <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> + <redmine.releaseFiles>target/${project.artifactId}-${project.version}-bin.zip,</redmine.releaseFiles> </properties> <packaging>jar</packaging> Modified: trunk/lima-main/src/main/assembly/bin.xml =================================================================== --- trunk/lima-main/src/main/assembly/bin.xml 2009-11-03 19:50:55 UTC (rev 2723) +++ trunk/lima-main/src/main/assembly/bin.xml 2009-11-04 14:36:03 UTC (rev 2724) @@ -17,7 +17,7 @@ <scope>runtime</scope> </dependencySet> </dependencySets> --> - + <files> <file> <source>target/${project.build.finalName}.${project.packaging}</source> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-03 19:50:55 UTC (rev 2723) +++ trunk/pom.xml 2009-11-04 14:36:03 UTC (rev 2724) @@ -209,7 +209,8 @@  <license.licenseName>gpl_v3</license.licenseName> - +  + <helper.includeAttached>false</helper.includeAttached> </properties> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-11-03 19:50:55 UTC (rev 2723) +++ trunk/src/site/site_fr.xml 2009-11-04 14:36:03 UTC (rev 2724) @@ -17,6 +17,7 @@ <item name="Présentation" href="presentation.html"/> <item name="ScreenShots" href="screenshots.html"/> <item name="Features" href="features.html"/> + <item name="Lancer Lima" href="lima-main/jnlp/launch.jnlp" /> <item name="Téléchargements" href="http://chorem.org/projects/list_files/lima" /> <item name="Lexique comptable" href="lexique.html" /> <item name="Contacts" href="contact.html" />

1 0

r2723 - in trunk/lima-main: . src/main/resources/i18n
by tchemit＠users.chorem.org 03 Nov '09

03 Nov '09

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.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - +  <maven.jar.main.class>org.chorem.lima.Main</maven.jar.main.class> -  - <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</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> +    - + <profiles> <profile> <id>release-profile</id> @@ -243,7 +302,29 @@ </activation> <build> <plugins> +  <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> + +  + <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

1 0

r2722 - in trunk: . src/site
by fdesbois＠users.chorem.org 03 Nov '09

03 Nov '09

Author: fdesbois Date: 2009-11-03 19:08:19 +0100 (Tue, 03 Nov 2009) New Revision: 2722 Added: trunk/src/site/site_fr.xml Removed: trunk/src/site/site.xml Modified: trunk/pom.xml Log: - Change i18n version snapshot to previous version - Change site.xml name Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 04:27:36 UTC (rev 2721) +++ trunk/pom.xml 2009-11-03 18:08:19 UTC (rev 2722) @@ -198,6 +198,7 @@ <nuiton-utils.version>1.1.1</nuiton-utils.version> <topia.version>2.2.0</topia.version> <jaxx.version>1.7.1</jaxx.version> + <i18n.version>1.0.1</i18n.version>  @@ -228,7 +229,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>${i18n.version}</version> </plugin> <plugin> Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2009-11-02 04:27:36 UTC (rev 2721) +++ trunk/src/site/site.xml 2009-11-03 18:08:19 UTC (rev 2722) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Lima"> - - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - <menu name="Lima" inherit="top"> - <item name="Présentation" href="presentation.html"/> - <item name="ScreenShots" href="screenshots.html"/> - <item name="Features" href="features.html"/> - <item name="Téléchargements" href="http://chorem.org/projects/list_files/lima" /> - <item name="Lexique comptable" href="lexique.html" /> - <item name="Contacts" href="contact.html" /> - <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> - </menu> - <menu name="Utilisateur" inherit="top" > - <item name="How To" href="howto.html" /> - </menu> - <menu ref="reports"/> - </body> - -</project> Copied: trunk/src/site/site_fr.xml (from rev 2721, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2009-11-03 18:08:19 UTC (rev 2722) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="Lima"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <menu name="Lima" inherit="top"> + <item name="Présentation" href="presentation.html"/> + <item name="ScreenShots" href="screenshots.html"/> + <item name="Features" href="features.html"/> + <item name="Téléchargements" href="http://chorem.org/projects/list_files/lima" /> + <item name="Lexique comptable" href="lexique.html" /> + <item name="Contacts" href="contact.html" /> + <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> + </menu> + <menu name="Utilisateur" inherit="top" > + <item name="How To" href="howto.html" /> + </menu> + <menu ref="reports"/> + </body> + +</project> Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:mergeinfo +

1 0

r2721 - trunk
by tchemit＠users.chorem.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 05:27:36 +0100 (Mon, 02 Nov 2009) New Revision: 2721 Modified: trunk/pom.xml Log: - use mavenpom 1.1.0 - reformat poms Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 04:25:21 UTC (rev 2720) +++ trunk/pom.xml 2009-11-02 04:27:36 UTC (rev 2721) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <groupId>org.chorem</groupId> @@ -50,7 +50,7 @@ <scope>compile</scope> </dependency> - + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -147,9 +147,9 @@ <description>Lima project super pom</description> <inceptionYear>2008</inceptionYear> <url>http://maven-site.chorem.org/lima</url> - - <licenses> + + <licenses> <license> <name>General Public License (GPL)</name> <url>${maven.license.file}</url> @@ -193,14 +193,14 @@ <projectId>lima</projectId>  - + <eugene.version>1.0.0</eugene.version> <nuiton-utils.version>1.1.1</nuiton-utils.version> <topia.version>2.2.0</topia.version> <jaxx.version>1.7.1</jaxx.version>  - +   <axis.version>1.3</axis.version> @@ -208,7 +208,7 @@  <license.licenseName>gpl_v3</license.licenseName> - + </properties> @@ -259,7 +259,8 @@ <scm> <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> - <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/lima/trunk</developerConnection> + <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/lima/trunk + </developerConnection> <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> @@ -281,7 +282,6 @@ </repository> -  <repository> @@ -333,5 +333,5 @@ </pluginRepository> </pluginRepositories> - + </project>

1 0

r2720 - in trunk: . lima-dto lima-main lima-service lima-service-callao lima-service-mock lima-service-neogia
by tchemit＠users.chorem.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 05:25:21 +0100 (Mon, 02 Nov 2009) New Revision: 2720 Modified: trunk/ trunk/lima-dto/ trunk/lima-main/ trunk/lima-service-callao/ trunk/lima-service-mock/ trunk/lima-service-neogia/ trunk/lima-service/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - lima*.i* *.log target bin .classpath .project + *.log target bin .classpath .project *.ipr *.iws *.iml Property changes on: trunk/lima-dto ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.ipr *.iws *.iml Property changes on: trunk/lima-main ___________________________________________________________________ Modified: svn:ignore - target gen error.txt *.log .classpath .project .settings + target gen error.txt *.log .classpath .project .settings *.ipr *.iws *.iml Property changes on: trunk/lima-service ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.ipr *.iws *.iml Property changes on: trunk/lima-service-callao ___________________________________________________________________ Modified: svn:ignore - target + target *.ipr *.iws *.iml Property changes on: trunk/lima-service-mock ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.ipr *.iws *.iml Property changes on: trunk/lima-service-neogia ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.ipr *.iws *.iml

1 0