Author: echatellier Date: 2014-05-12 18:38:45 +0200 (Mon, 12 May 2014) New Revision: 67 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/67 Log: Update application to run with sql server Added: trunk/src/rst/mssql.rst Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-persistence/src/main/resources/faxToMail.properties trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailFilter.java 2014-05-12 16:38:45 UTC (rev 67) @@ -41,7 +41,7 @@ public static final String PROPERTY_SENDER = "sender"; //public static final String PROPERTY_RECIPIENT = "recipient"; - public static final String PROPERTY_OBJECT = "object"; + public static final String PROPERTY_SUBJECT = "subject"; public static final String PROPERTY_MESSAGE = "message"; public static final String PROPERTY_BODY = "body"; public static final String PROPERTY_ETAT_ATTENTE = "etatAttente"; @@ -74,7 +74,7 @@ //protected String recipient; - protected String object; + protected String subject; protected String message; @@ -150,14 +150,14 @@ firePropertyChange(PROPERTY_RECIPIENT, oldValue, recipient); }*/ - public String getObject() { - return object; + public String getSubject() { + return subject; } - public void setObject(String object) { - String oldValue = this.object; - this.object = object; - firePropertyChange(PROPERTY_OBJECT, oldValue, object); + public void setSubject(String subject) { + String oldValue = this.subject; + this.subject = subject; + firePropertyChange(PROPERTY_SUBJECT, oldValue, subject); } public List<EtatAttente> getEtatAttente() { Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-05-12 16:38:45 UTC (rev 67) @@ -33,58 +33,6 @@ public class EmailTopiaDao extends AbstractEmailTopiaDao<Email> { - /*@Override - public MyInnerTopiaQueryBuilderAddCriteriaOrRunQueryStep newQueryBuilder() { - MyHqlAndParametersBuilder hqlAndParametersBuilder = new MyHqlAndParametersBuilder(getEntityClass()); - MyInnerTopiaQueryBuilderAddCriteriaOrRunQueryStep result = new MyInnerTopiaQueryBuilderAddCriteriaOrRunQueryStep(this, hqlAndParametersBuilder); - return result; - } - - public static class MyInnerTopiaQueryBuilderAddCriteriaOrRunQueryStep extends InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<Email> { - - protected MyInnerTopiaQueryBuilderAddCriteriaOrRunQueryStep(AbstractTopiaDao<Email> topiaDAO, - HqlAndParametersBuilder<Email> hqlAndParametersBuilder) { - super(topiaDAO, hqlAndParametersBuilder); - } - - public MyInnerTopiaQueryBuilderAddCriteriaOrRunQueryStep addContainsText(String property, Object value) { - ((MyHqlAndParametersBuilder) hqlAndParametersBuilder).addContainsText(property, value); - return this; - } - - public MyInnerTopiaQueryBuilderAddCriteriaOrRunQueryStep addEqualsIfNotNull(String property, Object value) { - ((MyHqlAndParametersBuilder) hqlAndParametersBuilder).addEqualsIfNotNull(property, value); - return this; - } - } - - public static class MyHqlAndParametersBuilder extends HqlAndParametersBuilder<Email> { - - public MyHqlAndParametersBuilder(Class<Email> entityClass) { - super(entityClass); - } - - public void addContainsText(String property, Object value) { - Preconditions.checkArgument(StringUtils.isNotEmpty(property)); - // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive types - // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type - if (value != null) { - String hqlParameterName = putHqlParameterWithAvailableName(property, "%" + value + "%"); - whereClauses.add("lower(" + alias + "." + property + ") like lower(:" + hqlParameterName + ")"); - } - } - - public void addEqualsIfNotNull(String property, Object value) { - Preconditions.checkArgument(StringUtils.isNotEmpty(property)); - // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive types - // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type - if (value != null) { - String hqlParameterName = putHqlParameterWithAvailableName(property, value); - whereClauses.add(alias + "." + property + " = :" + hqlParameterName); - } - } - }*/ - /** * Search for email using filter. * @@ -256,9 +204,9 @@ } // email subject - if (StringUtils.isNotBlank(emailFilter.getObject())) { - query.append(" AND lower(E." + Email.PROPERTY_OBJECT + ") LIKE lower(:" + EmailFilter.PROPERTY_OBJECT + ")"); - args.put(EmailFilter.PROPERTY_OBJECT, "%" + emailFilter.getObject() + "%"); + if (StringUtils.isNotBlank(emailFilter.getSubject())) { + query.append(" AND lower(E." + Email.PROPERTY_OBJECT + ") LIKE lower(:" + EmailFilter.PROPERTY_SUBJECT + ")"); + args.put(EmailFilter.PROPERTY_SUBJECT, "%" + emailFilter.getSubject() + "%"); } // email demand type Modified: trunk/faxtomail-persistence/src/main/resources/faxToMail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-persistence/src/main/resources/faxToMail.properties 2014-05-12 16:38:45 UTC (rev 67) @@ -21,27 +21,25 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### + +hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:/tmp/faxtomail/h2data;MODE=MSSQLServer hibernate.connection.username=sa hibernate.connection.password= +#hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect #hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver #hibernate.connection.url=jdbc:jtds:sqlserver://192.168.100.247:1433/faxtomail #hibernate.connection.username=fx #hibernate.connection.password=FX2013! -#hibernate.dialect=org.hibernate.dialect.SQLServerDialect - -hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.hbm2ddl.auto=update -#hibernate.show_sql=false -#hibernate.format_sql=true -hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy +hibernate.show_sql=false +hibernate.format_sql=true +#hibernate.ejb.naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy hibernate.c3p0.min_size=5 hibernate.c3p0.max_size=20 hibernate.c3p0.timeout=1800 hibernate.c3p0.max_statements=50 - -# hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-05-12 16:38:45 UTC (rev 67) @@ -24,6 +24,5 @@ model.tagValue.notGenerateToString=true model.tagValue.constantPrefix=PROPERTY_ model.tagValue.java.lang.String=text -#model.tagValue.java.lang.String=nvarchar($l) model.tagValue.useEnumerationName=true model.tagValue.doNotGenerateBooleanGetMethods=true Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-05-12 16:38:45 UTC (rev 67) @@ -76,7 +76,7 @@ Assert.assertEquals(18, emails.size()); // client code filter + subject filter - filter.setObject("ARENO"); + filter.setSubject("ARENO"); emails = service.search(filter); Assert.assertEquals(2, emails.size()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.css 2014-05-12 16:38:45 UTC (rev 67) @@ -149,7 +149,7 @@ } #subjectField { - text: {model.getObject()}; + text: {model.getSubject()}; } #senderLabel { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUI.jaxx 2014-05-12 16:38:45 UTC (rev 67) @@ -216,7 +216,7 @@ </cell> <cell columns='3' weightx='1'> <JTextField id='subjectField' - onKeyReleased='handler.setText(event, "object")'/> + onKeyReleased='handler.setText(event, "subject")'/> </cell> <cell> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.css 2014-05-12 16:38:45 UTC (rev 67) @@ -154,7 +154,7 @@ } #subjectField { - text: {model.getObject()}; + text: {model.getSubject()}; } #senderLabel { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUI.jaxx 2014-05-12 16:38:45 UTC (rev 67) @@ -227,7 +227,7 @@ </cell> <cell columns='3' weightx='1'> <JTextField id='subjectField' - onKeyReleased='handler.setText(event, "object")'/> + onKeyReleased='handler.setText(event, "subject")'/> </cell> <cell> Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-05-12 15:22:09 UTC (rev 66) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIModel.java 2014-05-12 16:38:45 UTC (rev 67) @@ -91,14 +91,14 @@ return editObject.getRecipient(); }*/ - public void setObject(String object) { - Object oldValue = getObject(); - editObject.setObject(object); - firePropertyChanged(EmailFilter.PROPERTY_OBJECT, oldValue, object); + public void setSubject(String subject) { + Object oldValue = getSubject(); + editObject.setSubject(subject); + firePropertyChanged(EmailFilter.PROPERTY_SUBJECT, oldValue, subject); } - public String getObject() { - return editObject.getObject(); + public String getSubject() { + return editObject.getSubject(); } public void setClientCode(String clientCode) { Added: trunk/src/rst/mssql.rst =================================================================== --- trunk/src/rst/mssql.rst (rev 0) +++ trunk/src/rst/mssql.rst 2014-05-12 16:38:45 UTC (rev 67) @@ -0,0 +1,41 @@ +.. - +.. * #%L +.. * FaxToMail +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2014 Franciaflex, Code Lutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU General Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - + +Déploiement sur MS-SQL Server +============================= + +Le serveur testé a été :: + + Microsoft SQL Server 2008 (SP3) - 10.0.5500.0 (X64) + Sep 21 2011 22:45:45 + Copyright (c) 1988-2008 Microsoft Corporation + Standard Edition (64-bit) on Windows NT 6.1 <X64> (Build 7601: Service Pack 1) (VM) + +La configuration à ajouter dans le fichier de configuration ``C:\Windows\System32\faxToMail.properties``:: + + hibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect + hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver + hibernate.connection.url=jdbc:jtds:sqlserver://192.168.100.247:1433/faxtomail + hibernate.connection.username=fx + hibernate.connection.password=FX2013! Property changes on: trunk/src/rst/mssql.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native