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

r3288 - in trunk: . lima-business lima-swing
by tchemit＠users.chorem.org Sept. 9, 2011

Sept. 9, 2011

Author: tchemit Date: 2011-09-09 18:14:41 +0200 (Fri, 09 Sep 2011) New Revision: 3288 Url: http://chorem.org/repositories/revision/lima/3288 Log: use new site deployment configuration Modified: trunk/lima-business/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-09-09 16:10:08 UTC (rev 3287) +++ trunk/lima-business/pom.xml 2011-09-09 16:14:41 UTC (rev 3288) @@ -1,4 +1,6 @@ -<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -18,7 +20,7 @@ <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> <scope>provided</scope> - </dependency> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>lima-callao</artifactId> @@ -104,7 +106,7 @@ <properties>  <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> - + <redmine.releaseFiles> target/lima-server-${project.version}-bin.zip, </redmine.releaseFiles> @@ -173,7 +175,7 @@ </plugin> </plugins> </build> - + <profiles> <profile> <id>assembly-profile</id> @@ -189,9 +191,9 @@ <artifactId>maven-assembly-plugin</artifactId> <configuration> <finalName>lima-server-${project.version}</finalName> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> <attach>false</attach> </configuration> <executions> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-09-09 16:10:08 UTC (rev 3287) +++ trunk/lima-swing/pom.xml 2011-09-09 16:14:41 UTC (rev 3288) @@ -128,7 +128,8 @@ <properties>  <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> - + <webstartPluginVersion>1.0-beta-2-SNAPSHOT</webstartPluginVersion> + <redmine.releaseFiles> target/lima-${project.version}-bin.zip, </redmine.releaseFiles> @@ -139,7 +140,8 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.bundleOutputName>lima</i18n.bundleOutputName> - + <jnlp.codebase>${project.url}/jnlp</jnlp.codebase> + </properties> <build> @@ -245,18 +247,31 @@ </plugin> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</version> <configuration> + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> + + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> <jnlpExtensions> -  <jnlpExtension> <name>jxlayer</name> <title>Swing labs JXLayer</title> @@ -289,9 +304,9 @@ <reporting> <plugins> <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20091001</version> + <version>${webstartPluginVersion}</version> </plugin> </plugins> </reporting> @@ -332,7 +347,7 @@ </plugin>  <plugin> - <groupId>org.nuiton.thirdparty</groupId> + <groupId>org.codehaus.mojo.webstart</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -348,7 +363,62 @@ </build> </profile> +  <profile> + <id>local-jnlp-profile</id> + <activation> + <property> + <name>doLocalWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> + </properties> + <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> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + + + <profile> <id>assembly-profile</id> <activation> <property> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:10:08 UTC (rev 3287) +++ trunk/pom.xml 2011-09-09 16:14:41 UTC (rev 3288) @@ -210,7 +210,6 @@ <version>1.5.0</version> </dependency> - </dependencies> </dependencyManagement> @@ -378,6 +377,13 @@ <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <repositories>  <!--repository>

1 0

r3287 - trunk
by tchemit＠users.chorem.org Sept. 9, 2011

Sept. 9, 2011

Author: tchemit Date: 2011-09-09 18:10:08 +0200 (Fri, 09 Sep 2011) New Revision: 3287 Url: http://chorem.org/repositories/revision/lima/3287 Log: Update mavenpom4redmine to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-19 16:31:43 UTC (rev 3286) +++ trunk/pom.xml 2011-09-09 16:10:08 UTC (rev 3287) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3286 - trunk
by tchemit＠users.chorem.org Aug. 19, 2011

Aug. 19, 2011

Author: tchemit Date: 2011-08-19 18:31:43 +0200 (Fri, 19 Aug 2011) New Revision: 3286 Url: http://chorem.org/repositories/revision/lima/3286 Log: Update mavenpom4redmine to 3.0.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-18 06:58:35 UTC (rev 3285) +++ trunk/pom.xml 2011-08-19 16:31:43 UTC (rev 3286) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.1</version> + <version>3.0.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3285 - in trunk: lima-business/src/license lima-callao/src/license lima-swing/src/license
by tchemit＠users.chorem.org Aug. 18, 2011

Aug. 18, 2011

Author: tchemit Date: 2011-08-18 08:58:35 +0200 (Thu, 18 Aug 2011) New Revision: 3285 Url: http://chorem.org/repositories/revision/lima/3285 Log: update third-parties Modified: trunk/lima-business/src/license/THIRD-PARTY.properties trunk/lima-callao/src/license/THIRD-PARTY.properties trunk/lima-swing/src/license/THIRD-PARTY.properties Modified: trunk/lima-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-business/src/license/THIRD-PARTY.properties 2011-08-16 23:13:57 UTC (rev 3284) +++ trunk/lima-business/src/license/THIRD-PARTY.properties 2011-08-18 06:58:35 UTC (rev 3285) @@ -2,21 +2,23 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 2 License -# - Apache 2 # - Apache License Version 1.1 # - Apache Software License - Version 2.0 # - Apache Software License 2.0 # - BSD License # - Bouncy Castle Licence # - Bouncy Castle License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - CPL # - Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 -# - GNU Lesser General Public License # - General Public License (GPL) # - HSQLDB License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - License Agreement for Java Transaction API Classes # - MIT License # - Mozilla Public License @@ -29,14 +31,14 @@ # Please fill the missing licenses for dependencies : # # -#Thu Mar 24 12:12:43 CET 2011 -antlr--antlr--2.7.6--jar=ANTLR 2 License -com.sun.xml.bind--jaxb-impl--2.1.9--jar=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license -commons-net--commons-net--2.0--jar=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=jdomlicence -javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License -javax.transaction--jta--1.1--jar=License Agreement for Java Transaction API Classes -org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0--jar=The Apache Software License, Version 2.0 -org.codehaus.swizzle--swizzle-stream--1.0.1--jar=The Apache Software License, Version 2.0 -quartz--quartz--1.5.2--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 08:57:26 CEST 2011 +antlr--antlr--2.7.6=ANTLR 2 License +com.sun.xml.bind--jaxb-impl--2.1.9=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license +commons-net--commons-net--2.0=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 +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes +org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0=The Apache Software License, Version 2.0 +org.codehaus.swizzle--swizzle-stream--1.0.1=The Apache Software License, Version 2.0 +quartz--quartz--1.5.2=The Apache Software License, Version 2.0 Modified: trunk/lima-callao/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-callao/src/license/THIRD-PARTY.properties 2011-08-16 23:13:57 UTC (rev 3284) +++ trunk/lima-callao/src/license/THIRD-PARTY.properties 2011-08-18 06:58:35 UTC (rev 3285) @@ -1,11 +1,13 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 2 License -# - Apache Software License, Version 2.0 # - BSD License -# - GNU Lesser General Public License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - License Agreement for Java Transaction API Classes # - MIT License # - The Apache Software License, Version 2.0 @@ -15,9 +17,9 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 22 08:18:24 CET 2010 -antlr--antlr--2.7.6--jar=ANTLR 2 License -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=jdomlicence -javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License -javax.transaction--jta--1.1--jar=License Agreement for Java Transaction API Classes +#Thu Aug 18 08:57:19 CEST 2011 +antlr--antlr--2.7.6=ANTLR 2 License +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=jdomlicence +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes Modified: trunk/lima-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/lima-swing/src/license/THIRD-PARTY.properties 2011-08-16 23:13:57 UTC (rev 3284) +++ trunk/lima-swing/src/license/THIRD-PARTY.properties 2011-08-18 06:58:35 UTC (rev 3285) @@ -2,20 +2,20 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 2 License -# - Apache 2 # - Apache License Version 1.1 # - Apache Software License - Version 2.0 # - Apache Software License 2.0 # - BSD License # - Bouncy Castle Licence # - Bouncy Castle License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - CPL -# - Common Development and Distribution License (CDDL) v1.0 # - Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - General Public License (GPL) # - HSQLDB License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -33,17 +33,17 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jul 11 11:37:32 CEST 2011 -antlr--antlr--2.7.6--jar=ANTLR 2 License -com.sun.xml.bind--jaxb-impl--2.1.9--jar=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license -commons-jxpath--commons-jxpath--1.3--jar=The Apache Software License, Version 2.0 -commons-net--commons-net--2.0--jar=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=jdomlicence -javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License -javax.mail--mail--1.4.1--jar=License Agreement for JavaMail(TM) API -javax.transaction--jta--1.1--jar=License Agreement for Java Transaction API Classes -org.apache.commons--commons-email--1.2--jar=The Apache Software License, Version 2.0 -org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0--jar=The Apache Software License, Version 2.0 -org.codehaus.swizzle--swizzle-stream--1.0.1--jar=The Apache Software License, Version 2.0 -quartz--quartz--1.5.2--jar=The Apache Software License, Version 2.0 +#Thu Aug 18 08:57:41 CEST 2011 +antlr--antlr--2.7.6=ANTLR 2 License +com.sun.xml.bind--jaxb-impl--2.1.9=Common Development and Distribution License (CDDL) v1.0 / GPLv2 + classpath exception dual license +commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 +commons-net--commons-net--2.0=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 +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API +javax.transaction--jta--1.1=License Agreement for Java Transaction API Classes +org.apache.commons--commons-email--1.2=The Apache Software License, Version 2.0 +org.apache.geronimo.specs--geronimo-j2ee-management_1.0_spec--1.0=The Apache Software License, Version 2.0 +org.codehaus.swizzle--swizzle-stream--1.0.1=The Apache Software License, Version 2.0 +quartz--quartz--1.5.2=The Apache Software License, Version 2.0

1 0

r3284 - trunk
by tchemit＠users.chorem.org Aug. 16, 2011

Aug. 16, 2011

Author: tchemit Date: 2011-08-17 01:13:57 +0200 (Wed, 17 Aug 2011) New Revision: 3284 Url: http://chorem.org/repositories/revision/lima/3284 Log: Update mavenpom4redmine to 3.0.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-16 15:11:15 UTC (rev 3283) +++ trunk/pom.xml 2011-08-16 23:13:57 UTC (rev 3284) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0</version> + <version>3.0.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r3283 - in trunk: . lima-business lima-callao lima-swing
by hudson＠users.chorem.org Aug. 16, 2011

Aug. 16, 2011

Author: hudson Date: 2011-08-16 17:11:15 +0200 (Tue, 16 Aug 2011) New Revision: 3283 Url: http://chorem.org/repositories/revision/lima/3283 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-08-16 15:11:08 UTC (rev 3282) +++ trunk/lima-business/pom.xml 2011-08-16 15:11:15 UTC (rev 3283) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1</version> + <version>0.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-08-16 15:11:08 UTC (rev 3282) +++ trunk/lima-callao/pom.xml 2011-08-16 15:11:15 UTC (rev 3283) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1</version> + <version>0.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-08-16 15:11:08 UTC (rev 3282) +++ trunk/lima-swing/pom.xml 2011-08-16 15:11:15 UTC (rev 3283) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1</version> + <version>0.5.2-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-16 15:11:08 UTC (rev 3282) +++ trunk/pom.xml 2011-08-16 15:11:15 UTC (rev 3283) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1</version> + <version>0.5.2-SNAPSHOT</version> <modules> <module>lima-callao</module> @@ -372,10 +372,10 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5.1</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5.1 + <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.5.1</url> + <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> <repositories>

1 0

r3282 - in tags: . lima-0.5.1
by hudson＠users.chorem.org Aug. 16, 2011

Aug. 16, 2011

Author: hudson Date: 2011-08-16 17:11:08 +0200 (Tue, 16 Aug 2011) New Revision: 3282 Url: http://chorem.org/repositories/revision/lima/3282 Log: [maven-release-plugin] copy for tag lima-0.5.1 Added: tags/lima-0.5.1/ Property changes on: tags/lima-0.5.1 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml Added: svn:mergeinfo +

1 0

r3281 - in trunk: . lima-business lima-callao lima-swing
by hudson＠users.chorem.org Aug. 16, 2011

Aug. 16, 2011

Author: hudson Date: 2011-08-16 17:11:07 +0200 (Tue, 16 Aug 2011) New Revision: 3281 Url: http://chorem.org/repositories/revision/lima/3281 Log: [maven-release-plugin] prepare release lima-0.5.1 Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-08-16 15:02:33 UTC (rev 3280) +++ trunk/lima-business/pom.xml 2011-08-16 15:11:07 UTC (rev 3281) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-08-16 15:02:33 UTC (rev 3280) +++ trunk/lima-callao/pom.xml 2011-08-16 15:11:07 UTC (rev 3281) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-08-16 15:02:33 UTC (rev 3280) +++ trunk/lima-swing/pom.xml 2011-08-16 15:11:07 UTC (rev 3281) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-16 15:02:33 UTC (rev 3280) +++ trunk/pom.xml 2011-08-16 15:11:07 UTC (rev 3281) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.5.1-SNAPSHOT</version> + <version>0.5.1</version> <modules> <module>lima-callao</module> @@ -372,10 +372,10 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk + <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5.1</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.5.1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/trunk</url> + <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.5.1</url> </scm> <repositories>

1 0

r3280 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by tchemit＠users.chorem.org Aug. 16, 2011

Aug. 16, 2011

Author: tchemit Date: 2011-08-16 17:02:33 +0200 (Tue, 16 Aug 2011) New Revision: 3280 Url: http://chorem.org/repositories/revision/lima/3280 Log: improve renderer Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java 2011-08-16 14:51:21 UTC (rev 3279) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java 2011-08-16 15:02:33 UTC (rev 3280) @@ -28,7 +28,6 @@ import org.chorem.lima.entity.Account; import javax.swing.DefaultListCellRenderer; -import javax.swing.JLabel; import javax.swing.JList; import java.awt.Component; @@ -43,7 +42,6 @@ boolean isSelected, boolean cellHasFocus) { - JLabel label = new JLabel(); Account account = (Account) value; if (account != null) { String accountLabel = account.getLabel(); @@ -51,9 +49,9 @@ if (accountLabel != null && accountLabel.length() > nbChars) { accountLabel = accountLabel.substring(0, nbChars) + "…"; } - label.setText(account.getAccountNumber() + " - " + accountLabel); + setText(account.getAccountNumber() + " - " + accountLabel); } - return label; + return this; } }

1 0

r3279 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by tchemit＠users.chorem.org Aug. 16, 2011

Aug. 16, 2011

Author: tchemit Date: 2011-08-16 16:51:21 +0200 (Tue, 16 Aug 2011) New Revision: 3279 Url: http://chorem.org/repositories/revision/lima/3279 Log: Anomalie #436: Pas possible d'ajouter ou modifier le compte d'une ?\195?\169criture Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java 2011-08-16 14:09:44 UTC (rev 3278) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountRenderer.java 2011-08-16 14:51:21 UTC (rev 3279) @@ -25,32 +25,35 @@ package org.chorem.lima.ui.combobox; -import java.awt.Component; +import org.chorem.lima.entity.Account; import javax.swing.DefaultListCellRenderer; import javax.swing.JLabel; import javax.swing.JList; +import java.awt.Component; -import org.chorem.lima.entity.Account; +public class AccountRenderer extends DefaultListCellRenderer { -public class AccountRenderer extends DefaultListCellRenderer { - private static final long serialVersionUID = 1L; @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - + public Component getListCellRendererComponent(JList list, + Object value, + int index, + boolean isSelected, + boolean cellHasFocus) { + JLabel label = new JLabel(); Account account = (Account) value; - if (account != null){ + if (account != null) { String accountLabel = account.getLabel(); int nbChars = 30; - if (accountLabel.length()>nbChars){ - accountLabel = accountLabel.substring(0, nbChars)+"…"; + if (accountLabel != null && accountLabel.length() > nbChars) { + accountLabel = accountLabel.substring(0, nbChars) + "…"; } - label.setText(account.getAccountNumber() +" - " + accountLabel); + label.setText(account.getAccountNumber() + " - " + accountLabel); } - return label; + return label; } - + }

1 0