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

r3708 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by tchemit＠users.chorem.org 09 Aug '13

09 Aug '13

Author: tchemit Date: 2013-08-09 12:06:55 +0200 (Fri, 09 Aug 2013) New Revision: 3708 Url: http://chorem.org/projects/lima/repository/revisions/3708 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/lima-business-api/pom.xml 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 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-business/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,8 +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"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -11,9 +9,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business</artifactId> -  -  -  + <name>Lima :: business</name> <description>Business module for lima</description> @@ -111,9 +107,7 @@ <artifactId>openejb-ejbd</artifactId> </dependency> </dependencies> -  -  -  + <build> <pluginManagement> <plugins> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-business-api/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,8 +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"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -11,9 +9,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business-api</artifactId> -  -  -  + <name>Lima :: business API</name> <description>Business API module for lima</description> @@ -29,9 +25,7 @@ <scope>provided</scope> </dependency> </dependencies> -  -  -  + <profiles> <profile> <id>reporting</id> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-callao/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,8 +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"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -11,9 +9,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-callao</artifactId> -  -  -  + <name>Lima :: callao</name> <description>Module persistence de Lima (Callao)</description> @@ -53,9 +49,7 @@ <artifactId>h2</artifactId> </dependency> </dependencies> -  -  -  + <build> <plugins>  Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/lima-swing/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,9 +1,7 @@ <?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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  + <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -12,14 +10,10 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-swing</artifactId> -  -  -  + <name>Lima :: Swing</name> <description>Lima main interface in Swing</description> -  -  -  + <properties>  <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> @@ -29,9 +23,11 @@ </redmine.releaseFiles> <license.generateBundle>true</license.generateBundle> - <license.bundleLicensePath>META-INF/lima-LICENSE.txt + <license.bundleLicensePath> + META-INF/lima-LICENSE.txt </license.bundleLicensePath> - <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt + <license.bundleThirdPartyPath> + META-INF/lima-THIRD-PARTY.txt </license.bundleThirdPartyPath> <i18n.bundles>fr_FR,en_GB</i18n.bundles> @@ -41,6 +37,9 @@ <signatureArtifactId>java16-sun</signatureArtifactId> <signatureVersion>1.10</signatureVersion> +  + <skipPostRelease>false</skipPostRelease> + </properties> <dependencies> @@ -306,9 +305,7 @@ </plugin> </plugins> </build> -  -  -  + <profiles> <profile> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) +++ trunk/pom.xml 2013-08-09 10:06:55 UTC (rev 3708) @@ -1,27 +1,20 @@ <?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/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> -  -  -  <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.13</version> + <version>4.0</version> </parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> <version>0.8-SNAPSHOT</version> - -  -  -  <packaging>pom</packaging> -  -  -  + <name>Lima</name> <description>Lima project super pom</description> <url>http://maven-site.chorem.org/lima</url> @@ -33,6 +26,7 @@ <distribution>repo</distribution> </license> </licenses> +  <developers> <developer> @@ -137,9 +131,7 @@ <module>lima-business</module> <module>lima-swing</module> </modules> -  -  -  + <scm> <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> <developerConnection>

1 0

r3707 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by maven-release＠users.chorem.org 04 Aug '13

04 Aug '13

Author: maven-release Date: 2013-08-04 10:45:53 +0200 (Sun, 04 Aug 2013) New Revision: 3707 Url: http://chorem.org/projects/lima/repository/revisions/3707 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business-api/pom.xml 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 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-business/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-business-api/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-callao/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/lima-swing/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-04 08:45:51 UTC (rev 3706) +++ trunk/pom.xml 2013-08-04 08:45:53 UTC (rev 3707) @@ -13,7 +13,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7</version> + <version>0.8-SNAPSHOT</version>   @@ -141,11 +141,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7 + scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.7</url> + <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> <distributionManagement> <site>

1 0

r3706 - in tags: . lima-0.7
by maven-release＠users.chorem.org 04 Aug '13

04 Aug '13

Author: maven-release Date: 2013-08-04 10:45:51 +0200 (Sun, 04 Aug 2013) New Revision: 3706 Url: http://chorem.org/projects/lima/repository/revisions/3706 Log: [maven-release-plugin] copy for tag lima-0.7 Added: tags/lima-0.7/ Property changes on: tags/lima-0.7 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml .settings .idea Added: svn:mergeinfo +

1 0

r3705 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by maven-release＠users.chorem.org 04 Aug '13

04 Aug '13

Author: maven-release Date: 2013-08-04 10:45:48 +0200 (Sun, 04 Aug 2013) New Revision: 3705 Url: http://chorem.org/projects/lima/repository/revisions/3705 Log: [maven-release-plugin] prepare release lima-0.7 Modified: trunk/lima-business-api/pom.xml 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 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-business/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-business-api/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-callao/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/lima-swing/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-04 08:01:12 UTC (rev 3704) +++ trunk/pom.xml 2013-08-04 08:45:48 UTC (rev 3705) @@ -13,7 +13,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.8-SNAPSHOT</version> + <version>0.7</version>   @@ -141,11 +141,11 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/lima/trunk + scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.7 </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/trunk</url> + <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.7</url> </scm> <distributionManagement> <site>

1 0

r3704 - tags
by tchemit＠users.chorem.org 04 Aug '13

04 Aug '13

Author: tchemit Date: 2013-08-04 10:01:12 +0200 (Sun, 04 Aug 2013) New Revision: 3704 Url: http://chorem.org/projects/lima/repository/revisions/3704 Log: bad reelase (try again) Removed: tags/0.7/

1 0

r3703 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by maven-release＠users.chorem.org 02 Aug '13

02 Aug '13

Author: maven-release Date: 2013-08-02 19:10:11 +0200 (Fri, 02 Aug 2013) New Revision: 3703 Url: http://chorem.org/projects/lima/repository/revisions/3703 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/lima-business-api/pom.xml 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 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-business/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,6 +1,4 @@ -<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>   @@ -8,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-business-api/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,6 +1,4 @@ -<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>   @@ -8,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-callao/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,6 +1,4 @@ -<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>   @@ -8,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/lima-swing/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,7 +1,5 @@ <?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/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>   @@ -9,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-02 17:10:01 UTC (rev 3702) +++ trunk/pom.xml 2013-08-02 17:10:11 UTC (rev 3703) @@ -1,7 +1,5 @@ <?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/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>  @@ -15,7 +13,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8-SNAPSHOT</version>

1 0

r3702 - in tags: . 0.7
by maven-release＠users.chorem.org 02 Aug '13

02 Aug '13

Author: maven-release Date: 2013-08-02 19:10:01 +0200 (Fri, 02 Aug 2013) New Revision: 3702 Url: http://chorem.org/projects/lima/repository/revisions/3702 Log: [maven-release-plugin] copy for tag 0.7 Added: tags/0.7/ Property changes on: tags/0.7 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml .settings .idea Added: svn:mergeinfo +

1 0

r3701 - in trunk: . lima-business lima-business-api lima-callao lima-swing lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition
by tchemit＠users.chorem.org 02 Aug '13

02 Aug '13

Author: tchemit Date: 2013-08-02 19:00:32 +0200 (Fri, 02 Aug 2013) New Revision: 3701 Url: http://chorem.org/projects/lima/repository/revisions/3701 Log: reformat poms fix webstart build do not use guava API Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-business/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,6 +1,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/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> - +    <parent> @@ -11,7 +13,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business</artifactId> - +    <name>Lima :: business</name> @@ -111,7 +113,7 @@ <artifactId>openejb-ejbd</artifactId> </dependency> </dependencies> - +    <build> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-business-api/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,6 +1,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/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> - +    <parent> @@ -11,7 +13,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business-api</artifactId> - +    <name>Lima :: business API</name> @@ -29,7 +31,7 @@ <scope>provided</scope> </dependency> </dependencies> - +    <profiles> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-callao/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,6 +1,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/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> - +    <parent> @@ -11,7 +13,7 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-callao</artifactId> - +    <name>Lima :: callao</name> @@ -31,7 +33,7 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -53,7 +55,7 @@ <artifactId>h2</artifactId> </dependency> </dependencies> - +    <build> @@ -102,12 +104,12 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> </executions> </plugin> </plugins> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,7 +1,9 @@ <?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/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> - +    <parent> @@ -12,12 +14,12 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-swing</artifactId> - +    <name>Lima :: Swing</name> <description>Lima main interface in Swing</description> - +    <properties> @@ -29,16 +31,18 @@ </redmine.releaseFiles> <license.generateBundle>true</license.generateBundle> - <license.bundleLicensePath>META-INF/lima-LICENSE.txt</license.bundleLicensePath> - <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt</license.bundleThirdPartyPath> - + <license.bundleLicensePath>META-INF/lima-LICENSE.txt + </license.bundleLicensePath> + <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt + </license.bundleThirdPartyPath> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.bundleOutputName>lima</i18n.bundleOutputName>  <signatureArtifactId>java16-sun</signatureArtifactId> <signatureVersion>1.10</signatureVersion> - + </properties> <dependencies> @@ -138,10 +142,10 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + </dependency> </dependencies> @@ -207,6 +211,14 @@ <include>org.eclipse.jetty.orbit:javax.servlet</include> </includes> </jnlpExtension> + <jnlpExtension> + <name>pdf-renderer</name> + <title>Jetty</title> + <vendor>Swing labs PDF renderer</vendor> + <includes> + <include>org.swinglabs:pdf-renderer</include> + </includes> + </jnlpExtension> </jnlpExtensions> </configuration> </plugin> @@ -229,7 +241,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -255,7 +267,8 @@ </goals> <configuration> <generateCsvFile>true</generateCsvFile> - <bundleCsvFile>${project.build.directory}/lima-i18n.csv</bundleCsvFile> + <bundleCsvFile>${project.build.directory}/lima-i18n.csv + </bundleCsvFile> </configuration> </execution> </executions> @@ -295,7 +308,7 @@ </plugin> </plugins> </build> - +    <profiles> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 17:00:32 UTC (rev 3701) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -38,6 +37,8 @@ import javax.swing.*; import javax.swing.event.ListSelectionEvent; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -90,7 +91,7 @@ public void setEntryBook(ListSelectionEvent event) { JList entryBookList = view.getEntryBookList(); - List selectedValuesList = Lists.newArrayList(entryBookList.getSelectedValues()); + List selectedValuesList = new ArrayList(Arrays.asList(entryBookList.getSelectedValues())); condition.setEntryBooks(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 17:00:32 UTC (rev 3701) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -39,6 +38,8 @@ import javax.swing.*; import javax.swing.event.ListSelectionEvent; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -93,7 +94,7 @@ public void setFinancialPeriod(ListSelectionEvent event) { JList financialPeriodList = view.getFinancialPeriodList(); - List selectedValuesList = Lists.newArrayList(financialPeriodList.getSelectedValues()); + List selectedValuesList = new ArrayList(Arrays.asList(financialPeriodList.getSelectedValues())); condition.setFinancialPeriods(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 17:00:32 UTC (rev 3701) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -38,6 +37,8 @@ import javax.swing.*; import javax.swing.event.ListSelectionEvent; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; @@ -91,7 +92,7 @@ public void setFiscalPeriod(ListSelectionEvent event) { JList fiscalPeriodList = view.getFiscalPeriodList(); - List selectedValuesList = Lists.newArrayList(fiscalPeriodList.getSelectedValues()); + List selectedValuesList = new ArrayList(Arrays.asList(fiscalPeriodList.getSelectedValues())); condition.setFiscalPeriods(selectedValuesList); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) +++ trunk/pom.xml 2013-08-02 17:00:32 UTC (rev 3701) @@ -1,7 +1,10 @@ <?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/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> - + +    <parent> @@ -12,11 +15,13 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7-SNAPSHOT</version> + +    <packaging>pom</packaging> - +    <name>Lima</name> @@ -30,7 +35,7 @@ <distribution>repo</distribution> </license> </licenses> - +  <developers> <developer> <id>echatellier</id> @@ -134,7 +139,7 @@ <module>lima-business</module> <module>lima-swing</module> </modules> - +    <scm> @@ -158,10 +163,12 @@  <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <nuitonProfilingVersion>2.7</nuitonProfilingVersion> - <eugenePluginVersion>2.6.3</eugenePluginVersion>  - <topiaVersion>2.7.1</topiaVersion>  + <eugenePluginVersion>2.6.3</eugenePluginVersion> +  + <topiaVersion>2.7.1</topiaVersion> +  <jaxxVersion>2.5.23</jaxxVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <openEjbVersion>4.5.2</openEjbVersion> @@ -228,7 +235,7 @@ <artifactId>commons-email</artifactId> <version>1.3.1</version> </dependency> - + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> @@ -313,10 +320,10 @@ <artifactId>openejb-core</artifactId> <version>${openEjbVersion}</version> <exclusions> - <exclusion> - <artifactId>slf4j-jdk14</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> + <exclusion> + <artifactId>slf4j-jdk14</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> </exclusions> <scope>compile</scope> </dependency>

1 0

r3700 - in trunk: lima-callao/src/main/java/org/chorem/lima/beans lima-swing lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by tchemit＠users.chorem.org 02 Aug '13

02 Aug '13

Author: tchemit Date: 2013-08-02 18:38:54 +0200 (Fri, 02 Aug 2013) New Revision: 3700 Url: http://chorem.org/projects/lima/repository/revisions/3700 Log: fix API Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodCondition.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -31,9 +31,12 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + * @since 0.7 */ public class FiscalPeriodCondition implements Condition, Serializable { + private static final long serialVersionUID = 1L; + protected List<FiscalPeriod> fiscalPeriods; public List<FiscalPeriod> getFiscalPeriods() { Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/pom.xml 2013-08-02 16:38:54 UTC (rev 3700) @@ -34,6 +34,10 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.bundleOutputName>lima</i18n.bundleOutputName> + +  + <signatureArtifactId>java16-sun</signatureArtifactId> + <signatureVersion>1.10</signatureVersion> </properties> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -89,7 +90,7 @@ public void setEntryBook(ListSelectionEvent event) { JList entryBookList = view.getEntryBookList(); - List selectedValuesList = entryBookList.getSelectedValuesList(); + List selectedValuesList = Lists.newArrayList(entryBookList.getSelectedValues()); condition.setEntryBooks(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -92,7 +93,7 @@ public void setFinancialPeriod(ListSelectionEvent event) { JList financialPeriodList = view.getFinancialPeriodList(); - List selectedValuesList = financialPeriodList.getSelectedValuesList(); + List selectedValuesList = Lists.newArrayList(financialPeriodList.getSelectedValues()); condition.setFinancialPeriods(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.Condition; @@ -76,7 +77,7 @@ public Object[] getFiscalPeriodList() { FiscalPeriodService fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); Object[] result = {}; - List<FiscalPeriod> periods = null; + List<FiscalPeriod> periods; try { periods = fiscalPeriodService.getAllFiscalPeriods(); result = periods.toArray(); @@ -90,7 +91,7 @@ public void setFiscalPeriod(ListSelectionEvent event) { JList fiscalPeriodList = view.getFiscalPeriodList(); - List selectedValuesList = fiscalPeriodList.getSelectedValuesList(); + List selectedValuesList = Lists.newArrayList(fiscalPeriodList.getSelectedValues()); condition.setFiscalPeriods(selectedValuesList); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java 2013-08-02 16:05:12 UTC (rev 3699) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java 2013-08-02 16:38:54 UTC (rev 3700) @@ -59,6 +59,7 @@ foreground = table.getSelectionForeground(); background = table.getSelectionBackground(); } else { + //FIXME tchemit-2013-08_02 Do not use sun. classes Color alternateColor = DefaultLookup.getColor(myCell, myCell.getUI(), "Table.alternateRowColor"); if (alternateColor != null) { @@ -91,9 +92,11 @@ if (hasFocus) { Border border = null; if (isSelected) { + //FIXME tchemit-2013-08_02 Do not use sun. classes border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.focusSelectedCellHighlightBorder"); } if (border == null) { + //FIXME tchemit-2013-08_02 Do not use sun. classes border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.focusCellHighlightBorder"); } myCell.setBorder(border); @@ -102,6 +105,7 @@ foreground = Color.BLACK; } } else { + //FIXME tchemit-2013-08_02 Do not use sun. classes Border border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.cellNoFocusBorder"); if (border == null) { border = new EmptyBorder(1, 1, 1, 1);

1 0

r3699 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by Bavencoff＠users.chorem.org 02 Aug '13

02 Aug '13

Author: Bavencoff Date: 2013-08-02 18:05:12 +0200 (Fri, 02 Aug 2013) New Revision: 3699 Url: http://chorem.org/projects/lima/repository/revisions/3699 Log: fix to release Modified: trunk/lima-business-api/pom.xml 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 2013-08-02 15:06:11 UTC (rev 3698) +++ trunk/lima-business/pom.xml 2013-08-02 16:05:12 UTC (rev 3699) @@ -1,7 +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"> <modelVersion>4.0.0</modelVersion> - -  +   <parent> @@ -12,7 +11,21 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business</artifactId> + +  +  + <name>Lima :: business</name> + <description>Business module for lima</description> + <properties> +  + <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> + + <redmine.releaseFiles> + target/lima-server-${project.version}-bin.zip, + </redmine.releaseFiles> + </properties> + <dependencies> <dependency> <groupId>org.apache.openejb</groupId> @@ -98,26 +111,9 @@ <artifactId>openejb-ejbd</artifactId> </dependency> </dependencies> - -  -  -  - <name>Lima :: business</name> - <description>Business module for lima</description> - - <properties> -  - <maven.jar.main.class>org.chorem.lima.LimaServer</maven.jar.main.class> - - <redmine.releaseFiles> - target/lima-server-${project.version}-bin.zip, - </redmine.releaseFiles> - </properties> - -  +   - <build> <pluginManagement> <plugins> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2013-08-02 15:06:11 UTC (rev 3698) +++ trunk/lima-business-api/pom.xml 2013-08-02 16:05:12 UTC (rev 3699) @@ -1,7 +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"> <modelVersion>4.0.0</modelVersion> - -  +   <parent> @@ -12,6 +11,11 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-business-api</artifactId> + +  +  + <name>Lima :: business API</name> + <description>Business API module for lima</description> <dependencies> <dependency> @@ -25,17 +29,9 @@ <scope>provided</scope> </dependency> </dependencies> - -  -  -  - <name>Lima :: business API</name> - <description>Business API module for lima</description> - -  +   - <profiles> <profile> <id>reporting</id> @@ -73,6 +69,4 @@ </profile> </profiles> - </project> - Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2013-08-02 15:06:11 UTC (rev 3698) +++ trunk/lima-callao/pom.xml 2013-08-02 16:05:12 UTC (rev 3699) @@ -1,10 +1,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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - -  +   - <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -13,6 +11,11 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-callao</artifactId> + +  +  + <name>Lima :: callao</name> + <description>Module persistence de Lima (Callao)</description> <dependencies> <dependency> @@ -23,12 +26,8 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> + <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -54,18 +53,9 @@ <artifactId>h2</artifactId> </dependency> </dependencies> - -  -  -  - - <name>Lima :: callao</name> - <description>Module persistence de Lima (Callao)</description> - -  +   - <build> <plugins>  @@ -162,5 +152,4 @@ </profile> </profiles> - </project> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2013-08-02 15:06:11 UTC (rev 3698) +++ trunk/lima-swing/pom.xml 2013-08-02 16:05:12 UTC (rev 3699) @@ -1,11 +1,9 @@ <?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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - -  +   - <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> @@ -14,7 +12,31 @@ <groupId>org.chorem.lima</groupId> <artifactId>lima-swing</artifactId> + +  +  + <name>Lima :: Swing</name> + <description>Lima main interface in Swing</description> + +  +  + <properties> +  + <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> + <redmine.releaseFiles> + target/lima-${project.version}-bin.zip, + </redmine.releaseFiles> + + <license.generateBundle>true</license.generateBundle> + <license.bundleLicensePath>META-INF/lima-LICENSE.txt</license.bundleLicensePath> + <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt</license.bundleThirdPartyPath> + + <i18n.bundles>fr_FR,en_GB</i18n.bundles> + <i18n.bundleOutputName>lima</i18n.bundleOutputName> + + </properties> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> @@ -61,11 +83,6 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -121,41 +138,9 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </dependency> </dependencies> - -  -  -  - - <name>Lima :: Swing</name> - <description>Lima main interface in Swing</description> - -  -  -  - <properties> -  - <maven.jar.main.class>org.chorem.lima.LimaMain</maven.jar.main.class> - - <redmine.releaseFiles> - target/lima-${project.version}-bin.zip, - </redmine.releaseFiles> - - <license.generateBundle>true</license.generateBundle> - <license.bundleLicensePath>META-INF/lima-LICENSE.txt</license.bundleLicensePath> - <license.bundleThirdPartyPath>META-INF/lima-THIRD-PARTY.txt</license.bundleThirdPartyPath> - - <i18n.bundles>fr_FR,en_GB</i18n.bundles> - <i18n.bundleOutputName>lima</i18n.bundleOutputName> - - </properties> - <build>  @@ -174,7 +159,55 @@ </excludes> </resource> </resources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + <manifestEntries> + <SplashScreen-Image>icons/puzzle_splash.png</SplashScreen-Image> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <gzip>true</gzip> + <unsign>true</unsign> + <canUnsign>false</canUnsign> +  + <pack200>false</pack200> + <jnlpExtensions> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer</title> + <vendor>Swing Labs</vendor> + <includes> + <include>org.swinglabs:jxlayer</include> + </includes> + </jnlpExtension> + <jnlpExtension> + <name>jetty</name> + <title>Jetty</title> + <vendor>IBM Corporation</vendor> + <includes> + <include>org.eclipse.jetty.orbit:javax.servlet</include> + </includes> + </jnlpExtension> + </jnlpExtensions> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> @@ -257,62 +290,10 @@ </executions> </plugin> </plugins> - - <pluginManagement> - <plugins> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - </manifest> - <manifestEntries> - <SplashScreen-Image>icons/puzzle_splash.png</SplashScreen-Image> - </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <configuration> - <gzip>true</gzip> - <unsign>true</unsign> - <canUnsign>false</canUnsign> -  - <pack200>false</pack200> - <jnlpExtensions> - <jnlpExtension> - <name>jxlayer</name> - <title>Swing labs JXLayer</title> - <vendor>Swing Labs</vendor> - <includes> - <include>org.swinglabs:jxlayer</include> - </includes> - </jnlpExtension> - <jnlpExtension> - <name>jetty</name> - <title>Jetty</title> - <vendor>IBM Corporation</vendor> - <includes> - <include>org.eclipse.jetty.orbit:javax.servlet</include> - </includes> - </jnlpExtension> - </jnlpExtensions> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> - -  +   - <profiles> <profile> @@ -533,5 +514,4 @@ </profile> </profiles> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-02 15:06:11 UTC (rev 3698) +++ trunk/pom.xml 2013-08-02 16:05:12 UTC (rev 3699) @@ -1,12 +1,9 @@ <?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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - -  +   - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> @@ -15,7 +12,121 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.7-SNAPSHOT</version> +  +  + <packaging>pom</packaging> + +  +  + <name>Lima</name> + <description>Lima project super pom</description> + <url>http://maven-site.chorem.org/lima</url> + <inceptionYear>2008</inceptionYear> + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>http://www.gnu.org/licenses/gpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <developers> + <developer> + <id>echatellier</id> + <name>Chatellier Eric</name> + <email>chatellier(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + <contributors> + <contributor> + <name>Cédric Houbart</name> + <email>cedric(a)scil.coop</email> + <organization>scil.coop</organization> + <organizationUrl>http://www.scil.coop/</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> + <name>Rémi Chapelet</name> + <email>chapelet(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> + <name>eduardo</name> + <email>ore(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> + <name>jpepin</name> + <email>pepin(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> + <name>vsalaun</name> + <email>salaun(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> + <name>mallon</name> + <email>mallon(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + <contributor> + <name>bavencoff</name> + <email>bavencoff(a)codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </contributor> + </contributors> <modules> <module>lima-callao</module> @@ -23,7 +134,78 @@ <module>lima-business</module> <module>lima-swing</module> </modules> + +  +  + <scm> + <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/trunk</url> + </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + <properties> + <platform>chorem.org</platform> + <projectId>lima</projectId> + +  + <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> + <nuitonProfilingVersion>2.7</nuitonProfilingVersion> + <eugenePluginVersion>2.6.3</eugenePluginVersion>  + <topiaVersion>2.7.1</topiaVersion>  + <jaxxVersion>2.5.23</jaxxVersion> + <nuitonI18nVersion>2.5.1</nuitonI18nVersion> + <openEjbVersion>4.5.2</openEjbVersion> + <slf4jVersion>1.7.5</slf4jVersion> + <swingxVersion>1.6.5-1</swingxVersion> + <jettyVersion>${jettyPluginVersion}</jettyVersion> + +  + <license.licenseName>gpl_v3</license.licenseName> + </properties> + + <repositories> +  + <repository> + <id>nexus.nuiton</id> + <name>NuitonNexusRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <pluginRepositories> +  + <pluginRepository> + <id>nexus.nuiton</id> + <name>NuitonNexusRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies> @@ -272,153 +454,7 @@ </dependencies> </dependencyManagement> -  -  -  - - <name>Lima</name> - <description>Lima project super pom</description> - <inceptionYear>2008</inceptionYear> - <url>http://maven-site.chorem.org/lima</url> - - - <licenses> - <license> - <name>General Public License (GPL)</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - -  - <developers> - <developer> - <id>echatellier</id> - <name>Chatellier Eric</name> - <email>chatellier(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <contributors> - <contributor> - <name>Cédric Houbart</name> - <email>cedric(a)scil.coop</email> - <organization>scil.coop</organization> - <organizationUrl>http://www.scil.coop/</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - <contributor> - <name>Rémi Chapelet</name> - <email>chapelet(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - <contributor> - <name>eduardo</name> - <email>ore(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - <contributor> - <name>jpepin</name> - <email>pepin(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - <contributor> - <name>vsalaun</name> - <email>salaun(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - <contributor> - <name>mallon</name> - <email>mallon(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - <contributor> - <name>bavencoff</name> - <email>bavencoff(a)codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </contributor> - </contributors> - -  -  -  - <packaging>pom</packaging> - - <properties> - <platform>chorem.org</platform> - <projectId>lima</projectId> - -  - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <nuitonProfilingVersion>2.7</nuitonProfilingVersion> - <eugenePluginVersion>2.6.3</eugenePluginVersion>  - <topiaVersion>2.7.1</topiaVersion>  - <jaxxVersion>2.5.23</jaxxVersion> - <nuitonI18nVersion>2.5.1</nuitonI18nVersion> - <openEjbVersion>4.5.2</openEjbVersion> - <slf4jVersion>1.7.5</slf4jVersion> - <swingxVersion>1.6.5-1</swingxVersion> - <jettyPluginVersion>8.1.11.v20130520</jettyPluginVersion> - <jettyVersion>${jettyPluginVersion}</jettyVersion> - -  - <license.licenseName>gpl_v3</license.licenseName> - </properties> - <build> - <pluginManagement> <plugins> @@ -460,61 +496,8 @@ </plugins> </pluginManagement> - </build> -  -  -  - <scm> - <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/trunk</url> - </scm> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - - <repositories> -  - <repository> - <id>nexus.nuiton</id> - <name>NuitonNexusRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/public</url> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - </repositories> - - <pluginRepositories> -  - <pluginRepository> - <id>nexus.nuiton</id> - <name>NuitonNexusRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/public</url> - <snapshots> - <enabled>true</enabled> - <updatePolicy>daily</updatePolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - <profiles> <profile>

1 0