[Wao-commits] r1756 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/action wao-web/src/main/java/fr/ifremer/wao/web/action/administration wao-web/src/main/java/fr/ifremer/wao/web/action/authentication wao-web/src/main/java/fr/ifremer/wao/web/action/json wao-web/src/main/java/fr/ifr

Author: tchemit Date: 2014-03-26 11:27:25 +0100 (Wed, 26 Mar 2014) New Revision: 1756 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1756 Log: respect Serializable contract Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,12 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; -public class AuthenticatedWaoUser { +import java.io.Serializable; +public class AuthenticatedWaoUser implements Serializable{ + + private static final long serialVersionUID = 1L; + protected WaoUser waoUser; protected UserProfile userProfile; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -35,6 +35,7 @@ import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.util.PeriodDates; +import java.io.Serializable; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -42,8 +43,10 @@ import java.util.Map; import java.util.Set; -public class UpdateSampleRowCommand { +public class UpdateSampleRowCommand implements Serializable{ + private static final long serialVersionUID = 1L; + protected DateFormat monthFormat = new SimpleDateFormat("yyyyMM"); protected boolean creation; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialState.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -21,14 +21,17 @@ * #L% */ +import java.io.Serializable; import java.util.Date; /** * Répresente l'état d'une référential à un instant donné. (Date de dernière * mise à jour par exemple). */ -public class ReferentialState { +public class ReferentialState implements Serializable{ + private static final long serialVersionUID = 1L; + protected String referentialName; protected long size; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UpdateWaoUserCommand.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -30,8 +30,12 @@ import fr.ifremer.wao.entity.WaoUser; import org.apache.commons.lang3.StringUtils; -public class UpdateWaoUserCommand { +import java.io.Serializable; +public class UpdateWaoUserCommand implements Serializable{ + + private static final long serialVersionUID = 1L; + protected ObsProgram obsProgram; protected WaoUser waoUser; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -27,6 +27,8 @@ public class WaoActionSupport extends BaseAction { + private static final long serialVersionUID = 1L; + protected WaoApplicationConfig applicationConfig; protected WaoSession session; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -137,6 +137,8 @@ } I18nInitializer initializer = new DefaultI18nInitializer("wao"); + // to show none translated sentences + initializer.setMissingKeyReturnNull(true); I18n.init(initializer, Locale.FRANCE); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class WaoJspActionSupport extends WaoActionSupport { + private static final long serialVersionUID = 1L; + protected WaoSession getSession() { return session; } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -29,6 +29,8 @@ public class WaoSession implements Serializable { + private static final long serialVersionUID = 1L; + public static final String SESSION_PARAMETER = "waoSession"; protected Collection<String> messages; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -21,6 +21,7 @@ * #L% */ +import com.opensymphony.xwork2.ObjectFactory; import fr.ifremer.wao.WaoEntityEnum; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,8 +30,10 @@ import java.util.Map; -public class WaoStrutsObjectFactory extends StrutsObjectFactory { +public class WaoStrutsObjectFactory extends ObjectFactory { + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(WaoStrutsObjectFactory.class); @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractDownloadCsvAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -38,6 +38,8 @@ ) public abstract class AbstractDownloadCsvAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-dd-MM_HHhmm"); public abstract String getFileName(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -37,12 +37,14 @@ public abstract class AbstractImportCsvAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(AbstractImportCsvAction.class); protected static final ImmutableSet<String> CSV_CONTENT_TYPES = ImmutableSet.of("text/csv", "text/comma-separated-values", "application/vnd.ms-excel"); - protected ReferentialService service; + protected transient ReferentialService service; protected File csvFile; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/IndexAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -32,6 +32,8 @@ }) public class IndexAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + protected ObsProgram obsProgram; @Override Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/AbstractImportReferentialAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,5 +31,6 @@ }) public abstract class AbstractImportReferentialAction extends AbstractImportCsvAction { + private static final long serialVersionUID = 1L; } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/CompaniesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -30,8 +30,10 @@ public class CompaniesAction extends WaoJspActionSupport implements Preparable { - protected CompaniesService service; + private static final long serialVersionUID = 1L; + protected transient CompaniesService service; + protected List<Company> companies; public void setService(CompaniesService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteCompanyAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ }) public class DeleteCompanyAction extends WaoJspActionSupport { - protected CompaniesService service; + private static final long serialVersionUID = 1L; + protected transient CompaniesService service; + protected String companyId; public void setCompanyId(String companyId) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/DeleteWaoUserAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ }) public class DeleteWaoUserAction extends WaoJspActionSupport { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected String waoUserId; public void setService(WaoUsersService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditCompanyAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -35,8 +35,10 @@ }) public class EditCompanyAction extends WaoJspActionSupport implements Preparable { - protected CompaniesService service; + private static final long serialVersionUID = 1L; + protected transient CompaniesService service; + protected String companyId; protected Company company; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -42,8 +42,10 @@ }) public class EditWaoUserAction extends WaoJspActionSupport implements Preparable { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected Optional<String> optionalWaoUserId = Optional.absent(); protected Optional<String> optionalCompanyId = Optional.absent(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportBoatGroupsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected void importCsv(InputStream csvInputStream) throws ImportErrorException { service.importBoatGroups(csvInputStream); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportBoatsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected void importCsv(InputStream csvInputStream) throws ImportErrorException { service.importBoats(csvInputStream); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportContactStateMotivesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportContactStateMotivesAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.contactStateMotives.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportFishingZonesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportFishingZonesAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.fishingZones.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportObsdebCodesAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportObsdebCodesAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.obsDebCodes.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialDivisionsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportTerrestrialDivisionsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.terrestrialDivisions.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportTerrestrialLocationsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -28,6 +28,8 @@ public class ImportTerrestrialLocationsAction extends AbstractImportReferentialAction { + private static final long serialVersionUID = 1L; + @Override protected String getSuccessMessage() { return I18n.t("wao.import.terrestrialLocations.success"); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ReferentialManagementAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,10 @@ public class ReferentialManagementAction extends WaoJspActionSupport implements Preparable { - protected ReferentialService referentialService; + private static final long serialVersionUID = 1L; + protected transient ReferentialService referentialService; + protected List<ReferentialState> referentialStates; public void setReferentialService(ReferentialService referentialService) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/WaoUsersAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ public class WaoUsersAction extends WaoJspActionSupport implements Preparable { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected Optional<String> optionalCompanyId = Optional.absent(); protected List<WaoUser> waoUsers; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -44,8 +44,10 @@ }) public class LoginAction extends WaoJspActionSupport { - protected WaoUsersService service; + private static final long serialVersionUID = 1L; + protected transient WaoUsersService service; + protected String login; protected String password; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LogoutAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -30,6 +30,8 @@ }) public class LogoutAction extends WaoJspActionSupport { + private static final long serialVersionUID = 1L; + @Override public String execute() { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/json/WaoJsonActionSupport.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -25,4 +25,6 @@ public class WaoJsonActionSupport extends WaoActionSupport { + private static final long serialVersionUID = 1L; + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/CommentSampleRowAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,8 +33,10 @@ }) public class CommentSampleRowAction extends WaoJspActionSupport { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + protected String sampleRowId; protected String comment; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteNewsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,10 @@ }) public class DeleteNewsAction extends WaoJspActionSupport { - protected NewsService service; + private static final long serialVersionUID = 1L; + protected transient NewsService service; + protected String newsId; public void setService(NewsService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditNewsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -34,8 +34,10 @@ }) public class EditNewsAction extends WaoJspActionSupport implements Preparable { - protected NewsService service; + private static final long serialVersionUID = 1L; + protected transient NewsService service; + protected String newsId; protected News news; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/EditSampleRowAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -48,9 +48,11 @@ }) public class EditSampleRowAction extends WaoJspActionSupport implements Preparable { + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(EditSampleRowAction.class); - protected ObsMerSamplingPlanService service; + protected transient ObsMerSamplingPlanService service; protected Optional<String> optionalSampleRowId = Optional.absent(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -31,8 +31,10 @@ public class ExportSamplingPlanAction extends AbstractDownloadCsvAction implements Preparable { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + protected SampleRowsFilter filter; public void setService(ObsMerSamplingPlanService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ImportSamplingPlanAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -35,8 +35,10 @@ }) public class ImportSamplingPlanAction extends AbstractImportCsvAction { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + public void setService(ObsMerSamplingPlanService service) { this.service = service; } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/NewsAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -29,8 +29,10 @@ public class NewsAction extends WaoJspActionSupport { - protected NewsService service; + private static final long serialVersionUID = 1L; + protected transient NewsService service; + protected List<News> recentNews; public void setService(NewsService service) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SampleRowLogAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -27,8 +27,10 @@ public class SampleRowLogAction extends WaoJspActionSupport { - protected ObsMerSamplingPlanService service; + private static final long serialVersionUID = 1L; + protected transient ObsMerSamplingPlanService service; + protected String sampleRowId; protected SampleRow sampleRow; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-26 10:26:25 UTC (rev 1755) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-03-26 10:27:25 UTC (rev 1756) @@ -33,7 +33,7 @@ protected transient ObsMerSamplingPlanService service; - protected transient SampleRowsFilter filter; + protected SampleRowsFilter filter; protected ObsMerSamplingPlan samplingPlan;