[Echobase-commits] r305 - in trunk: . echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources/i18n echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/csv echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData echobase-ui/src/main/webapp/WEB-INF/jsp/importData

2 Feb 2012

Author: tchemit
Date: 2012-02-03 00:46:23 +0100 (Fri, 03 Feb 2012)
New Revision: 305

Url: http://forge.codelutin.com/repositories/revision/echobase/305

Log:
continue imports + use mavenpom 3.1

Modified:
   trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java
   trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java
   trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java
   trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java
   trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java
   trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonData.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperation.jsp
   trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResults.jsp
   trunk/pom.xml

Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java
===================================================================

--- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java	2012-02-02 23:46:23 UTC (rev 305)
@@ -77,13 +77,6 @@
         }
     };
 
-    public static final Function<Species, String> SPECIES_CODE_MEMO = new Function<Species, String>() {
-        @Override
-        public String apply(Species input) {
-            return input.getCodeMemo();
-        }
-    };
-
     public static final Function<Vessel, String> VESSEL_NAME = new Function<Vessel, String>() {
         @Override
         public String apply(Vessel input) {

Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties
===================================================================
--- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties	2012-02-02 23:46:23 UTC (rev 305)
@@ -269,4 +269,3 @@
 echobase.common.vesselType=
 echobase.common.voyage=Campagne
 echobase.config.data.directory.description=Chemin de l'application
-

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java	2012-02-02 23:46:23 UTC (rev 305)
@@ -128,7 +128,7 @@
         return dao;
     }
 
-    protected void commitTransaction(String errorMessage) {
+    public void commitTransaction(String errorMessage) {
         try {
             getTransaction().commitTransaction();
         } catch (TopiaException eee) {

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java	2012-02-02 23:46:23 UTC (rev 305)
@@ -82,9 +82,9 @@
                 List<Species> allSpecies =
                         getEntities(Species.class);
                 Map<String, Species> speciesMap = Maps.uniqueIndex(
-                        allSpecies, EchoBaseFunctions.SPECIES_CODE_MEMO);
+                        allSpecies, EchoBaseFunctions.SPECIES_BARACOUDA_CODE);
 
-                if (configuration.canImportLengthWeightKeyFile()) {
+                if (configuration.canImportLengthAgeKeyFile()) {
 
                     List<Strata> allStratas =
                             getEntities(Strata.class);

Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java
===================================================================
--- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/LengthAgeKeyImportModel.java	2012-02-02 23:46:23 UTC (rev 305)
@@ -60,7 +60,7 @@
 
         newMandatoryColumn(LengthAgeKeyImportModelRow.PROPERTY_VOYAGE, CsvModelUtil.newForeignKeyValue(Voyage.class, voyageMap));
         newMandatoryColumn(LengthAgeKeyImportModelRow.PROPERTY_STRATA, CsvModelUtil.newForeignKeyValue(Strata.class, strataMap));
-        newMandatoryColumn(LengthAgeKeyImportModelRow.PROPERTY_SPECIES, CsvModelUtil.newForeignKeyValue(Species.class, speciesMap));
+        newMandatoryColumn("codeMemo", LengthAgeKeyImportModelRow.PROPERTY_SPECIES, CsvModelUtil.newForeignKeyValue(Species.class, speciesMap));
 
     }
 

Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java
===================================================================
--- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java	2012-02-02 23:46:23 UTC (rev 305)
@@ -74,6 +74,8 @@
 
         try {
             service.startImport(model, getEchoBaseSession().getEchoBaseUser());
+
+            service.commitTransaction("Could not commit imported data");
         } catch (Exception e) {
 
             if (log.isErrorEnabled()) {

Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java
===================================================================
--- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonData.java	2012-02-02 23:46:23 UTC (rev 305)
@@ -87,17 +87,20 @@
 
             getModel().setImportMode(CommonDataImportMode.ALL);
         }
+
         return INPUT;
     }
 
     @InputConfig(methodName = "input")
-    public String modeAll() {
-        return SUCCESS;
+    public String modeAll() throws Exception {
+
+        return execute();
     }
 
     @InputConfig(methodName = "input")
-    public String modeTransect() {
-        return SUCCESS;
+    public String modeTransect() throws Exception {
+
+        return execute();
     }
 
     public Map<String, String> getMissions() {

Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java
===================================================================
--- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java	2012-02-02 23:46:23 UTC (rev 305)
@@ -81,13 +81,15 @@
     }
 
     @InputConfig(methodName = "input")
-    public String modeVoyage() {
-        return SUCCESS;
+    public String modeVoyage() throws Exception {
+
+        return execute();
     }
 
     @InputConfig(methodName = "input")
-    public String modeAcoustic() {
-        return SUCCESS;
+    public String modeAcoustic() throws Exception {
+
+        return execute();
     }
 
     public Map<String, String> getVoyages() {

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -176,7 +176,7 @@
   </fieldset>
   <br/>
   <s:submit action="configureAccousticData"
-            value='%{getText("echobase.action.configureImport")}'/>
+            value='%{getText("echobase.action.import")}'/>
 
 
 </s:form>

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -59,7 +59,7 @@
 
   <br/>
   <s:submit action="configureCatchesData"
-            value='%{getText("echobase.action.configureImport")}'/>
+            value='%{getText("echobase.action.import")}'/>
 
 
 </s:form>
\ No newline at end of file

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonData.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -111,7 +111,7 @@
 </s:a>
   <br/>
   <s:submit action="ConfigureCommonData-modeAll"
-            value='%{getText("echobase.action.configureImport")}'/>
+            value='%{getText("echobase.action.import")}'/>
 
 </s:form>
 
@@ -155,7 +155,7 @@
 
   <br/>
   <s:submit action="ConfigureCommonData-modeTransect"
-            value='%{getText("echobase.action.configureImport")}'/>
+            value='%{getText("echobase.action.import")}'/>
 
 
 </s:form>
\ No newline at end of file

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperation.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -64,7 +64,7 @@
 
   <br/>
   <s:submit action="configureOperation"
-            value='%{getText("echobase.action.configureImport")}'/>
+            value='%{getText("echobase.action.import")}'/>
 
 
 </s:form>
\ No newline at end of file

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResults.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -40,7 +40,6 @@
 
     var incomingVal = $('[name="model.importMode"][checked="checked"]').val();
     $('#' + incomingVal).show();
-
   });
 </script>
 
@@ -75,7 +74,7 @@
 
   <br/>
   <s:submit action="ConfigureResults-modeVoyage"
-            value='%{getText("echobase.action.configureImport")}'/>
+            value='%{getText("echobase.action.import")}'/>
 
 </s:form>
 
@@ -107,6 +106,6 @@
 
   <br/>
   <s:submit action="ConfigureResults-modeAcoustic"
-            value='%{getText("echobase.action.configureImport")}'/>
+            value='%{getText("echobase.action.import")}'/>
 
 </s:form>
\ No newline at end of file

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -25,7 +25,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sj" uri="/struts-jquery-tags" %>
 
-<s:url id="url" action="import-AccousticData" namespace="/importData"/>
+<s:url id="url" action="importAccousticData" namespace="/importData"/>
 <meta http-equiv="refresh" content="1;url=${url}"/>
 
 <title>

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -25,7 +25,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sj" uri="/struts-jquery-tags" %>
 
-<s:url id="url" action="import-CatchesData" namespace="/importData"/>
+<s:url id="url" action="importCatchesData" namespace="/importData"/>
 <meta http-equiv="refresh" content="1;url=${url}"/>
 
 <title>

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonData.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonData.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonData.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -25,7 +25,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sj" uri="/struts-jquery-tags" %>
 
-<s:url id="url" action="import-CommonData" namespace="/importData"/>
+<s:url id="url" action="importCommonData" namespace="/importData"/>
 <meta http-equiv="refresh" content="1;url=${url}"/>
 
 <title>

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperation.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperation.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperation.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -25,7 +25,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sj" uri="/struts-jquery-tags" %>
 
-<s:url id="url" action="import-Operation" namespace="/importData"/>
+<s:url id="url" action="importOperation" namespace="/importData"/>
 <meta http-equiv="refresh" content="1;url=${url}"/>
 
 <title>

Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResults.jsp
===================================================================
--- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResults.jsp	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResults.jsp	2012-02-02 23:46:23 UTC (rev 305)
@@ -25,7 +25,7 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="sj" uri="/struts-jquery-tags" %>
 
-<s:url id="url" action="import-Results" namespace="/importData"/>
+<s:url id="url" action="importResults" namespace="/importData"/>
 <meta http-equiv="refresh" content="1;url=${url}"/>
 
 <title>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2012-02-02 22:58:29 UTC (rev 304)
+++ trunk/pom.xml	2012-02-02 23:46:23 UTC (rev 305)
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmine</artifactId>
-    <version>3.0.7</version>
+    <version>3.1</version>
   </parent>
 
   <groupId>fr.ifremer</groupId>
@@ -120,10 +120,7 @@
     <h2Version>1.3.163</h2Version>
     <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>
     <slf4jVersion>1.6.4</slf4jVersion>
-    <!--<jettyVersion>7.5.3.v20111011</jettyVersion>-->
     <jackcessVersion>1.2.6</jackcessVersion>
-    <!-- This version does not work (missing javax.el api in overlay) -->
-    <jettyVersion>8.1.0.RC5</jettyVersion>
 
     <hibernateVersion>3.6.9.Final</hibernateVersion>
 
@@ -331,7 +328,7 @@
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-runner</artifactId>
-        <version>${jettyVersion}</version>
+        <version>${jettyPluginVersion}</version>
         <scope>provided</scope>
       </dependency>
 
@@ -428,27 +425,6 @@
           <version>${nuitonI18nVersion}</version>
         </plugin>
 
-        <!-- remove this when using mavenpom 3.1 -->
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>wagon-maven-plugin</artifactId>
-          <version>${wagonPluginVersion}</version>
-        </plugin>
-
-        <!-- remove this when using mavenpom 3.1 -->
-        <plugin>
-          <groupId>org.nuiton</groupId>
-          <artifactId>helper-maven-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>
-
-        <!-- remove this when using mavenpom 3.1 -->
-        <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
-          <version>${jettyPluginVersion}</version>
-        </plugin>
-
       </plugins>
     </pluginManagement>

    

tchemit＠users.forge.codelutin.com