This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 08036089b41387ce8ba1508728c6a83e730e63ed Author: Kevin Morin <morin@codelutin.com> Date: Mon Aug 17 10:47:04 2015 +0200 ajout des signatures dans le modèle + migration (refs #7419) --- .../src/main/xmi/faxtomail.properties | 5 +++- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 32016 -> 32665 bytes .../services/service/InitFaxToMailServiceImpl.java | 29 ++----------------- .../services/service/ReferentielServiceImpl.java | 9 +++++- .../h2/V1_4_0_150817__add_signings_to_users.sql | 32 +++++++++++++++++++++ .../V1_4_0_150817__add_signings_to_users.sql | 32 +++++++++++++++++++++ .../src/main/resources/struts.properties | 3 +- 7 files changed, 80 insertions(+), 30 deletions(-) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.properties b/faxtomail-persistence/src/main/xmi/faxtomail.properties index f101632..faa06ad 100644 --- a/faxtomail-persistence/src/main/xmi/faxtomail.properties +++ b/faxtomail-persistence/src/main/xmi/faxtomail.properties @@ -131,4 +131,7 @@ com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockOn.tagvalu com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockOn.stereotype=unique # BrandsForDomain -com.franciaflex.faxtomail.persistence.entities.BrandsForDomain.attribute.domainName.tagvalue.notNull=true \ No newline at end of file +com.franciaflex.faxtomail.persistence.entities.BrandsForDomain.attribute.domainName.tagvalue.notNull=true + +#Stamp +#com.franciaflex.faxtomail.persistence.entities.Stamp.attribute.label.tagvalue.naturalId=true \ No newline at end of file diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 2658cec..f89ff84 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java index 540f52d..d629b37 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailServiceImpl.java @@ -24,32 +24,7 @@ package com.franciaflex.faxtomail.services.service; * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Client; -import com.franciaflex.faxtomail.persistence.entities.DemandStatus; -import com.franciaflex.faxtomail.persistence.entities.DemandType; -import com.franciaflex.faxtomail.persistence.entities.DemandTypeTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Email; -import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroup; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserGroupTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.FaxToMailUserTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.History; -import com.franciaflex.faxtomail.persistence.entities.HistoryTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.HistoryType; -import com.franciaflex.faxtomail.persistence.entities.MailField; -import com.franciaflex.faxtomail.persistence.entities.MailFolder; -import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.OriginalEmail; -import com.franciaflex.faxtomail.persistence.entities.OriginalEmailTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Priority; -import com.franciaflex.faxtomail.persistence.entities.PriorityTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.Range; -import com.franciaflex.faxtomail.persistence.entities.RangeRow; -import com.franciaflex.faxtomail.persistence.entities.RangeRowTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.RangeTopiaDao; -import com.franciaflex.faxtomail.persistence.entities.WaitingState; -import com.franciaflex.faxtomail.persistence.entities.WaitingStateTopiaDao; +import com.franciaflex.faxtomail.persistence.entities.*; import com.franciaflex.faxtomail.services.DecoratorService; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; @@ -171,7 +146,7 @@ public class InitFaxToMailServiceImpl extends FaxToMailServiceSupport implements FaxToMailUserGroup commerciauxGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Commerciaux", FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Commerciaux"); FaxToMailUserGroup savGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "SAV", - FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/SAV"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/SAV"); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Administrateurs", FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Administrateurs"); diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java index f0bae47..50e51b9 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielServiceImpl.java @@ -54,6 +54,8 @@ import com.franciaflex.faxtomail.services.service.imports.WaitingStateImportMode import org.apache.commons.collections4.map.MultiKeyMap; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; import org.nuiton.csv.ImportRuntimeException; import org.nuiton.jaxx.application.ApplicationTechnicalException; @@ -72,6 +74,11 @@ import java.util.Map; */ public class ReferentielServiceImpl extends FaxToMailServiceSupport implements ReferentielService { + /** + * Logger. + */ + private static final Log log = LogFactory.getLog(ReferentielServiceImpl.class); + @Override public List<DemandType> getAllDemandType() { DemandTypeTopiaDao dao = getPersistenceContext().getDemandTypeDao(); @@ -93,7 +100,7 @@ public class ReferentielServiceImpl extends FaxToMailServiceSupport implements R @Override public List<Stamp> getAllStamps() { StampTopiaDao dao = getPersistenceContext().getStampDao(); - return dao.forAll().setOrderByArguments(Stamp.PROPERTY_LABEL).findAll(); + return dao.forSigningEquals(false).setOrderByArguments(Stamp.PROPERTY_LABEL).findAll(); } @Override diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150817__add_signings_to_users.sql b/faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150817__add_signings_to_users.sql new file mode 100644 index 0000000..6362b12 --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150817__add_signings_to_users.sql @@ -0,0 +1,32 @@ +-- add signings + +create table SIGNING ( + topiaId varchar(255) not null, + topiaVersion bigint not null, + topiaCreateDate timestamp, + defaultsigning boolean, + stamp varchar(255), + faxtomailuser varchar(255), + primary key (topiaId) +); + +alter table SIGNING + add constraint FK_GD2AAMHXEMVLK1YBJO29P2GE5_INDEX_A + foreign key (faxtomailuser) + references faxtomailuser; + +alter table SIGNING + add constraint FK_QACW13RQL32JL97IM0EOHSL4Y_INDEX_A + foreign key (stamp) + references stamp; + +alter table stamp add signing boolean; +alter table stamp add faxtomailuser varchar(255); + +alter table stamp + add constraint FK_KPY7QI4OX3LIY20GRSP7D449M_INDEX_4 + foreign key (faxtomailuser) + references faxtomailuser; + +update stamp set signing = 'f'; + diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_4_0_150817__add_signings_to_users.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_4_0_150817__add_signings_to_users.sql new file mode 100644 index 0000000..62e34ae --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V1_4_0_150817__add_signings_to_users.sql @@ -0,0 +1,32 @@ +-- add signings + +create table SIGNING ( + topiaId varchar(255) not null, + topiaVersion bigint not null, + topiaCreateDate datetime2, + defaultsigning bit, + stamp varchar(255), + faxtomailuser varchar(255), + primary key (topiaId) +); + +alter table SIGNING + add constraint FK_GD2AAMHXEMVLK1YBJO29P2GE5_INDEX_A + foreign key (faxtomailuser) + references faxtomailuser; + +alter table SIGNING + add constraint FK_QACW13RQL32JL97IM0EOHSL4Y_INDEX_A + foreign key (stamp) + references stamp; + +alter table stamp add signing bit; +alter table stamp add faxtomailuser varchar(255); + +alter table stamp + add constraint FK_KPY7QI4OX3LIY20GRSP7D449M_INDEX_4 + foreign key (faxtomailuser) + references faxtomailuser; + +update stamp set signing = 0; + diff --git a/faxtomail-ui-web/src/main/resources/struts.properties b/faxtomail-ui-web/src/main/resources/struts.properties index d18619d..cbd3d9d 100644 --- a/faxtomail-ui-web/src/main/resources/struts.properties +++ b/faxtomail-ui-web/src/main/resources/struts.properties @@ -25,7 +25,8 @@ struts.ui.theme=bootstrap struts.ognl.allowStaticMethodAccess=true # Help debugging -struts.devMode=${devMode} +#struts.devMode=${devMode} +struts.devMode=true struts.ognl.logMissingProperties=${devMode} struts.el.throwExceptionOnFailure=${devMode} struts.i18n.reload=${devMode} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.