branch develop updated (1792fa7 -> da41ade)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 1792fa7 refs #1163 update progression bar status and label new 3ad1ac7 fixes #116 lancement du jar de l'ui fonctionnel new da41ade refs #1159 lancement de lima-server fonctionnel The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit da41ade611786cef6f047c842151c0a24e934156 Author: dcosse <japbiw74> Date: Fri Feb 13 18:54:48 2015 +0100 refs #1159 lancement de lima-server fonctionnel commit 3ad1ac7b9f907437ebd7b0aa6040d9ae48036d67 Author: dcosse <japbiw74> Date: Fri Feb 13 18:53:04 2015 +0100 fixes #116 lancement du jar de l'ui fonctionnel Summary of changes: lima-swing/pom.xml | 30 ++++++++++++++++++++++ lima-swing/src/license/THIRD-PARTY.properties | 9 ++++++- .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 2 +- lima-web/pom.xml | 7 +++-- pom.xml | 8 ++++++ 6 files changed, 51 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 3ad1ac7b9f907437ebd7b0aa6040d9ae48036d67 Author: dcosse <japbiw74> Date: Fri Feb 13 18:53:04 2015 +0100 fixes #116 lancement du jar de l'ui fonctionnel --- lima-swing/pom.xml | 30 ++++++++++++++++++++++ lima-swing/src/license/THIRD-PARTY.properties | 9 ++++++- .../resources/i18n/lima-swing_en_GB.properties | 1 + .../resources/i18n/lima-swing_fr_FR.properties | 2 +- pom.xml | 8 ++++++ 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 9defa9a..88c46d5 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -190,6 +190,11 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> + + <dependency> + <groupId>org.bluestemsoftware.open.maven.plugin</groupId> + <artifactId>launch4j-plugin</artifactId> + </dependency> </dependencies> <build> @@ -220,6 +225,7 @@ <manifest> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> + <mainClass>org.chorem.lima.LimaMain</mainClass> </manifest> <manifestEntries> <SplashScreen-Image>icons/puzzle_splash.png</SplashScreen-Image> @@ -485,6 +491,30 @@ </activation> <build> <plugins> + + <plugin> + <groupId>org.bluestemsoftware.open.maven.plugin</groupId> + <artifactId>launch4j-plugin</artifactId> + <executions> + <execution> + <id>launch4j</id> + <phase>package</phase> + <goals> + <goal>launch4j</goal> + </goals> + <configuration> + <dontWrapJar>true</dontWrapJar> + <headerType>gui</headerType> + <outfile>target/lima.exe</outfile> + <jar>lima.jar</jar> + <errTitle>${project.name}</errTitle> + <jre> + <minVersion>1.7.0</minVersion> + </jre> + </configuration> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> diff --git a/lima-swing/src/license/THIRD-PARTY.properties b/lima-swing/src/license/THIRD-PARTY.properties index 32c4a2f..2cceb0a 100644 --- a/lima-swing/src/license/THIRD-PARTY.properties +++ b/lima-swing/src/license/THIRD-PARTY.properties @@ -10,6 +10,7 @@ # - Apache Software License 2.0 # - BSD # - BSD License +# - BSD style # - CDDL # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 @@ -19,7 +20,9 @@ # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 +# - Eclipse Public License - v 1.0 # - GNU General Lesser Public License (LGPL) version 3.0 +# - GNU General Public License # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence # - GNU Lesser General Public License @@ -45,14 +48,18 @@ # Please fill the missing licenses for dependencies : # # -#Wed Oct 01 18:06:12 CEST 2014 +#Fri Feb 13 18:39:13 CET 2015 +classworlds--classworlds--1.1-alpha-2=The Apache Software License, Version 2.0 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence eclipse--jdtcore--3.1.0=Eclipse Public License - v 1.0 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 org.codehaus.castor--castor--1.2=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-archiver--1.0-alpha-7=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-container-default--1.0-alpha-9-stable-1=The Apache Software License, Version 2.0 org.metatype.sxc--sxc-jaxb-core--0.8=CDDL 1.1 org.metatype.sxc--sxc-runtime--0.8=CDDL 1.1 org.olap4j--olap4j--0.9.7.309-JS-3=GNU Lesser General Public License xml-apis--xml-apis--1.3.02=The Apache Software License, Version 2.0 +xpp3--xpp3_min--1.1.3.4.O=The Apache Software License, Version 2.0 diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 0531cee..0142911 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -396,6 +396,7 @@ lima.label=Label lima.launch.accounting= lima.launch.finished= lima.launch.services= +lima.launch.webServer= lima.lettering.account=Accounts lima.lettering.account.aAll= lima.lettering.account.back= diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index e93b43b..7480da3 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -410,6 +410,7 @@ lima.label=Libellé lima.launch.accounting=Chargement de la comptabilité lima.launch.finished=Application prête \! lima.launch.services=Chargement des services +lima.launch.webServer=Lancement du service distant lima.lettering.account=Comptes lima.lettering.account.aAll=TOUS lima.lettering.account.back=← @@ -492,4 +493,3 @@ lima.vatStatement.remove.title=supprimer de ligne ? lima.vatStatement.shortened=Plan TVA abrégé lima.vatStatements=Plan TVA lima.wait=Traitement en cours -lima.launch.webServer=Lancement du service distant \ No newline at end of file diff --git a/pom.xml b/pom.xml index 12182e5..c8091ed 100644 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,7 @@ <jdomVersion>2.0.5</jdomVersion> <jettyPluginVersion>9.2.3.v20140905</jettyPluginVersion> <junitVersion>4.11</junitVersion> + <launch4jPluginVersion>1.5.0.0</launch4jPluginVersion> <log4jVersion>1.2.17</log4jVersion> <openejbJavaeeApiVersion>6.0-6</openejbJavaeeApiVersion> <openEjbVersion>4.7.1</openEjbVersion> @@ -574,6 +575,13 @@ <artifactId>javax.servlet-api</artifactId> <version>${javaxServletVersion}</version> </dependency> + + <dependency> + <groupId>org.bluestemsoftware.open.maven.plugin</groupId> + <artifactId>launch4j-plugin</artifactId> + <version>${launch4jPluginVersion}</version> + </dependency> + </dependencies> </dependencyManagement> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit da41ade611786cef6f047c842151c0a24e934156 Author: dcosse <japbiw74> Date: Fri Feb 13 18:54:48 2015 +0100 refs #1159 lancement de lima-server fonctionnel --- lima-web/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lima-web/pom.xml b/lima-web/pom.xml index 5906767..9edc524 100644 --- a/lima-web/pom.xml +++ b/lima-web/pom.xml @@ -134,9 +134,6 @@ </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>lima.properties</exclude> - </excludes> </resource> </resources> <pluginManagement> @@ -144,6 +141,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jasperreports-maven-plugin</artifactId> + <version>1.5.0.0</version> <executions> <execution> <goals> @@ -166,6 +164,7 @@ <manifest> <addClasspath>true</addClasspath> <classpathPrefix>./lib/</classpathPrefix> + <mainClass>org.chorem.lima.LimaServer</mainClass> </manifest> </archive> </configuration> @@ -216,7 +215,7 @@ <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>lima-web-server-${project.version}</finalName> + <finalName>lima-server-${project.version}</finalName> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm