Project

General

Profile

« Previous | Next » 

Revision 53916

1. pom.xml: Add commented plugin for surfire (possibly needed in openjdk: bug in their release) | update version of javax.mail.
2. FetchContextHandler.java: bug fix in parsing resultset.
3. QueryGenerator.java: bug fix in query of method 'generateSelectFirstContextByCommunityIdQuery'.
4. TestClass.java: Tests for sending email notifications added.
5. EmailScheduler.java: 'sendEmailNotifications' boolean variable added to control if email scheduler will run or not.
6. EmailSender.java: Fix subject and content of emails | bug fixes | bcc emails to Greece's test mail.
7. springContext-claimsDemo.properties: Add 'services.claims.mail.contactMail', 'services.claims.mail.openaireProjectClaimsPage',
'services.claims.mail.openaireCommunityClaimsPage', 'services.claims.mail.manageCommunityUserNotificationsPage' properties.
8. springContext-claimsDemo.xml: Add missing beans for 'EmailSender' and 'EmailScheduler' classes.

View differences:

springContext-claimsDemo.xml
117 117
        <property name="fetchClaimHandler" ref="fetchClaimHandler"/>
118 118
        <property name="fetchProjectHandler" ref="fetchProjectHandler"/>
119 119
        <property name="fetchNotificationHandler" ref="fetchNotificationHandler"/>
120
        <property name="notificationHandler" ref="notificationHandler"/>
120 121
        <property name="fetchContextHandler" ref="fetchContextHandler"/>
121
        <property name="openaireClaimsPage" value="${services.claims.mail.angularUrl}"/>
122
        <property name="manageCommunityUserNotificationsPage" value="${services.claims.mail.manageCommunityUserNotificationsPage}"/>
123
        <property name="openaireProjectClaimsPage" value="${services.claims.mail.openaireProjectClaimsPage}"/>
124
        <property name="openaireCommunityClaimsPage" value="${services.claims.mail.openaireCommunityClaimsPage}"/>
122 125
        <property name="username" value="${services.claims.mail.from}"/>
123 126
        <property name="password" value="${services.claims.mail.password}"/>
124 127
        <property name="host" value="${services.claims.mail.host}"/>
125 128
        <property name="port" value="${services.claims.mail.port}"/>
126 129
        <property name="from" value="${services.claims.mail.from}"/>
130
        <property name="contactMail" value="${services.claims.mail.contactMail}"/>
127 131
        <property name="specialRecipients" value="${services.claims.mail.specialRecipients}"/>
132
        <property name="defaultFrequencyInHours" ref="defaultFrequencyInHours"/>
128 133
    </bean>
129 134

  
130 135
    <bean id="CommunityUtils" class="eu.dnetlib.data.claimsDemo.CommunityUtils">
......
147 152
        <property name="updateOnInsert" value="true"/>
148 153
    </bean>
149 154

  
155
    <bean id="emailScheduler" class="eu.dnetlib.data.emailSender.EmailScheduler">
156
        <property name="sendEmailNotifications" value="true"/>
157
        <property name="beautySleep" ref="beautySleep"/>
158
        <property name="targetHour" ref="targetHour"/>
159
        <property name="targetMinute" ref="targetMinute"/>
160
        <property name="targetSecond" ref="targetSecond"/>
161
        <property name="emailSender" ref="emailSender"/>
162
    </bean>
163

  
150 164
    <bean id="beautySleep" class="java.lang.String">
151 165
        <constructor-arg type="String" value="86400"/>
152 166
    </bean>

Also available in: Unified diff