[Lima-commits] 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

2 Aug 2013

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>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** POM Relationships *************************************** -->
   <!-- ************************************************************* -->
   <parent>
@@ -11,7 +13,7 @@
 
   <groupId>org.chorem.lima</groupId>
   <artifactId>lima-business</artifactId>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Project Information ************************************* -->
   <!-- ************************************************************* -->
   <name>Lima :: business</name>
@@ -111,7 +113,7 @@
       <artifactId>openejb-ejbd</artifactId>
     </dependency>
   </dependencies>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Build Settings ****************************************** -->
   <!-- ************************************************************* -->
   <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>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** POM Relationships *************************************** -->
   <!-- ************************************************************* -->
   <parent>
@@ -11,7 +13,7 @@
 
   <groupId>org.chorem.lima</groupId>
   <artifactId>lima-business-api</artifactId>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Project Information ************************************* -->
   <!-- ************************************************************* -->
   <name>Lima :: business API</name>
@@ -29,7 +31,7 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Build Settings ****************************************** -->
   <!-- ************************************************************* -->
   <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>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** POM Relationships *************************************** -->
   <!-- ************************************************************* -->
   <parent>
@@ -11,7 +13,7 @@
 
   <groupId>org.chorem.lima</groupId>
   <artifactId>lima-callao</artifactId>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Project Information ************************************* -->
   <!-- ************************************************************* -->
   <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 Settings ****************************************** -->
   <!-- ************************************************************* -->
   <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>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** POM Relationships *************************************** -->
   <!-- ************************************************************* -->
   <parent>
@@ -12,12 +14,12 @@
 
   <groupId>org.chorem.lima</groupId>
   <artifactId>lima-swing</artifactId>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Project Information ************************************* -->
   <!-- ************************************************************* -->
   <name>Lima :: Swing</name>
   <description>Lima main interface in Swing</description>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Build Settings ****************************************** -->
   <!-- ************************************************************* -->
   <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>
 
     <!-- uses some sun.xxx classes -->
     <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>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Build Environment  ************************************** -->
   <!-- ************************************************************* -->
   <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>
-<!-- ************************************************************* -->
+
+  <!-- ************************************************************* -->
   <!-- *** POM Relationships *************************************** -->
   <!-- ************************************************************* -->
   <parent>
@@ -12,11 +15,13 @@
 
   <groupId>org.chorem</groupId>
   <artifactId>lima</artifactId>
-  <version>0.7-SNAPSHOT</version><!-- ************************************************************* -->
+  <version>0.7-SNAPSHOT</version>
+
+  <!-- ************************************************************* -->
   <!-- *** Build Settings ****************************************** -->
   <!-- ************************************************************* -->
   <packaging>pom</packaging>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Project Information ************************************* -->
   <!-- ************************************************************* -->
   <name>Lima</name>
@@ -30,7 +35,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-<!-- Developpers, contributors... -->
+  <!-- Developpers, contributors... -->
   <developers>
     <developer>
       <id>echatellier</id>
@@ -134,7 +139,7 @@
     <module>lima-business</module>
     <module>lima-swing</module>
   </modules>
-<!-- ************************************************************* -->
+  <!-- ************************************************************* -->
   <!-- *** Build Environment  ************************************** -->
   <!-- ************************************************************* -->
   <scm>
@@ -158,10 +163,12 @@
     <!-- customized libs version -->
     <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
     <nuitonProfilingVersion>2.7</nuitonProfilingVersion>
-    <eugenePluginVersion>2.6.3</eugenePluginVersion> <!-- Do not move since
-    topia can not move (tchemit 2013-07-15) -->
-    <topiaVersion>2.7.1</topiaVersion> <!-- Version cannot be upgraded because of incompatibility with OpenEJB
-    -chatellier ???-->
+    <eugenePluginVersion>2.6.3</eugenePluginVersion>
+    <!-- Do not move since
+       topia can not move (tchemit 2013-07-15) -->
+    <topiaVersion>2.7.1</topiaVersion>
+    <!-- Version cannot be upgraded because of incompatibility with OpenEJB
+       -chatellier ???-->
     <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>

    

tchemit＠users.chorem.org