Project

General

Profile

« Previous | Next » 

Revision 57031

- rename properties files springContext-claimsDemo.xml --> springContext-claims.xml
- rename properties paths services.claimsDemo.* to services.claims.*

View differences:

modules/uoa-claims/trunk/src/main/resources/eu/dnetlib/data/claims/springContext-claimsDemo.properties
1

  
2
services.claimsDemo.db.driverClassName = org.postgresql.Driver
3
services.claimsDemo.db.url = jdbc:postgresql://scoobydoo.di.uoa.gr:5432/claims_www_last
4
services.claimsDemo.db.username = postgres
5
services.claimsDemo.db.password = snowflakes
6
services.claimsDemo.useProductionIndex = false
7

  
8
services.claimsDemo.communityAPI = https://dev-openaire.d4science.org/openaire/community/
9

  
10
#email properties
11
## EMAIL SETTINGS
12
services.claims.mail.host = smtp.gmail.com
13
services.claims.mail.port = 587
14
services.claims.mail.auth = true
15
services.claims.mail.from = invalid_email@email.com
16
services.claims.mail.username = invalid_email@email.com
17
services.claims.mail.password = invalid_password
18
services.claims.mail.specialRecipients = invalid_recipient@email.com
19
services.claims.mail.contactMail = openaire.test@gmail.com
20
services.claims.mail.openaireProjectClaimsPage = http://duffy.di.uoa.gr:4300/claims-project-manager?openaireId=
21
services.claims.mail.openaireCommunityClaimsPage = http://duffy.di.uoa.gr:4200/claims?communityId=
22
services.claims.mail.manageCommunityUserNotificationsPage = https://beta.admin.connect.openaire.eu/manage-user-notifications?communityId=
23

  
24
emailScheduler.sendEmailNotifications = false 
25

  
26
services.claimsDemo.results.pathToSaveRecord = /home/argirok/claims_www_last/records/
27
services.claimsDemo.reports.pathToSaveReport = /home/argirok/claims_www_last/reports/
28

  
29
#old version
30
#services.claims.directClaimAPIUrl = http://beta.services.openaire.eu:8280/is/mvc/api/publications
31
services.claims.directClaimAPIUrl = http://beta.services.openaire.eu:8980/provision/mvc/api/results
32

  
33

  
34
services.claims.mail.enabledCommunities = invalid_community_pid
modules/uoa-claims/trunk/src/main/resources/eu/dnetlib/data/claims/springContext-claimsDemo.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2
<beans xmlns="http://www.springframework.org/schema/beans"
3
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
       xsi:schemaLocation="
5
		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd "
6
       default-autowire="byName">
7
    <!--Un comment in order to run the tests / Comment to deploy-->
8
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
9
        <property name="locations" value="classpath:eu/dnetlib/data/claims/springContext-claimsDemo.properties"/>
10
    </bean>
11
    <bean id="directIndexHandler" class="eu.dnetlib.data.claims.handler.DirectIndexHandler">
12
        <property name="directClaimAPIUrl"  value="${services.claims.directClaimAPIUrl}"/>
13
    </bean>
14
    <bean id="fetchClaimHandler" class="eu.dnetlib.data.claims.handler.FetchClaimHandler">
15
        <property name="sqlDAO" ref="sqlDao"/>
16
        <property name="queryGenerator" ref="queryGenerator"/>
17

  
18
    </bean>
19
    <bean id="claimHandler" class="eu.dnetlib.data.claims.handler.ClaimHandler">
20
        <property name="sqlDAO" ref="sqlDao"/>
21
        <property name="queryGenerator" ref="queryGenerator"/>
22
        <property name="projectHandler" ref="projectHandler"/>
23
        <property name="resultHandler" ref="resultHandler"/>
24
        <property name="claimValidation" ref="claimValidation"/>
25
        <property name="useProductionIndex" value="${services.claimsDemo.useProductionIndex}"/>
26
    </bean>
27
    <bean id="externalRecordHandler" class="eu.dnetlib.data.claims.handler.ExternalRecordHandler">
28
        <property name="searchUtils" ref="searchUtils"/>
29
        <property name="externalRecordParser" ref="externalRecordParser"/>
30
    </bean>
31
    <bean id="fetchProjectHandler" class="eu.dnetlib.data.claims.handler.FetchProjectHandler">
32
        <property name="sqlDAO" ref="sqlDao"/>
33
        <property name="queryGenerator" ref="queryGenerator"/>
34

  
35
    </bean>
36

  
37
    <bean id="projectHandler" class="eu.dnetlib.data.claims.handler.ProjectHandler">
38
        <property name="searchUtils" ref="searchUtils"/>
39
        <property name="oafParser" ref="oafParser"/>
40
        <property name="queryGenerator" ref="queryGenerator"/>
41
        <property name="sqlDAO" ref="sqlDao"/>
42
    </bean>
43

  
44
    <bean id="fetchNotificationHandler" class="eu.dnetlib.data.claims.handler.FetchNotificationHandler">
45
        <property name="sqlDAO" ref="sqlDao"/>
46
        <property name="queryGenerator" ref="queryGenerator"/>
47

  
48
    </bean>
49

  
50
    <bean id="notificationHandler" class="eu.dnetlib.data.claims.handler.NotificationHandler">
51
        <property name="queryGenerator" ref="queryGenerator"/>
52
        <property name="sqlDAO" ref="sqlDao"/>
53
    </bean>
54

  
55
    <bean id="fetchContextHandler" class="eu.dnetlib.data.claims.handler.FetchContextHandler">
56
        <property name="sqlDAO" ref="sqlDao"/>
57
        <property name="queryGenerator" ref="queryGenerator"/>
58

  
59
    </bean>
60

  
61
    <bean id="indexResultHandler" class="eu.dnetlib.data.claims.handler.IndexResultHandler">
62
        <property name="searchUtils" ref="searchUtils"/>
63
    </bean>
64
    <bean id="resultHandler" class="eu.dnetlib.data.claims.handler.ResultHandler">
65
        <property name="sqlDAO" ref="sqlDao"/>
66
        <property name="queryGenerator" ref="queryGenerator"/>
67
        <!--<property name="pathToSaveRecord" value="/home/argirok/claims_beta/"/>-->
68
        <property name="pathToSaveRecord" value="${services.claimsDemo.results.pathToSaveRecord}"/>
69

  
70
    </bean>
71
    <!-- End of Handlers -->
72
    <!--Parsers -->
73
    <bean id="oafParser" class="eu.dnetlib.data.claims.parser.OafParser"></bean>
74
    <bean id="externalRecordParser" class="eu.dnetlib.data.claims.parser.ExternalRecordParser"></bean>
75
    <!-- end of Parsers -->
76
    <bean id="searchUtils" class="eu.dnetlib.data.claims.utils.SearchUtils"></bean>
77

  
78
    <bean id="claimValidation" class="eu.dnetlib.data.claims.utils.ClaimValidation">
79
        <property name="pathToSaveReport" value="${services.claimsDemo.reports.pathToSaveReport}"/>
80
    </bean>
81

  
82
    <bean id="emailSender" class="eu.dnetlib.data.emailSender.EmailSender">
83
        <property name="fetchClaimHandler" ref="fetchClaimHandler"/>
84
        <property name="fetchProjectHandler" ref="fetchProjectHandler"/>
85
        <property name="fetchNotificationHandler" ref="fetchNotificationHandler"/>
86
        <property name="notificationHandler" ref="notificationHandler"/>
87
        <property name="fetchContextHandler" ref="fetchContextHandler"/>
88
        <property name="manageCommunityUserNotificationsPage" value="${services.claims.mail.manageCommunityUserNotificationsPage}"/>
89
        <property name="openaireProjectClaimsPage" value="${services.claims.mail.openaireProjectClaimsPage}"/>
90
        <property name="openaireCommunityClaimsPage" value="${services.claims.mail.openaireCommunityClaimsPage}"/>
91
        <property name="username" value="${services.claims.mail.from}"/>
92
        <property name="password" value="${services.claims.mail.password}"/>
93
        <property name="host" value="${services.claims.mail.host}"/>
94
        <property name="port" value="${services.claims.mail.port}"/>
95
        <property name="auth" value="${services.claims.mail.auth}"/>
96
        <property name="from" value="${services.claims.mail.from}"/>
97
        <property name="contactMail" value="${services.claims.mail.contactMail}"/>
98
        <property name="specialRecipients" value="${services.claims.mail.specialRecipients}"/>
99
        <property name="defaultFrequencyInHours" ref="defaultFrequencyInHours"/>
100
        <property name="enabledCommunities" value="${services.claims.mail.enabledCommunities}"/>
101
    </bean>
102

  
103
    <bean id="CommunityUtils" class="eu.dnetlib.data.claims.utils.CommunityUtils">
104
        <property name="communityAPI" value="${services.claimsDemo.communityAPI}"/>
105
    </bean>
106
    
107
    <bean id="sqlStore" class="eu.dnetlib.data.claims.sql.SqlStore" init-method="init" destroy-method="destroy">
108
        <property name="dbUser" value="${services.claimsDemo.db.username}"/>
109
        <property name="dbPassword" value="${services.claimsDemo.db.password}"/>
110
        <property name="dbDriver" value="${services.claimsDemo.db.driverClassName}"/>
111
        <property name="dbUrl" value="${services.claimsDemo.db.url}"/>
112
    </bean>
113

  
114
    <bean id="sqlDao" class="eu.dnetlib.data.claims.sql.SqlDAO">
115
        <property name="sqlStore" ref="sqlStore"/>
116
    </bean>
117

  
118

  
119
    <bean id="queryGenerator" class="eu.dnetlib.data.claims.utils.QueryGenerator">
120
        <property name="updateOnInsert" value="true"/>
121
    </bean>
122

  
123
    <bean id="emailScheduler" class="eu.dnetlib.data.emailSender.EmailScheduler">
124
        <property name="sendEmailNotifications" value="${emailScheduler.sendEmailNotifications}"/>
125
        <property name="beautySleep" ref="beautySleep"/>
126
        <property name="targetHour" ref="targetHour"/>
127
        <property name="targetMinute" ref="targetMinute"/>
128
        <property name="targetSecond" ref="targetSecond"/>
129
        <property name="emailSender" ref="emailSender"/>
130
    </bean>
131

  
132
    <bean id="beautySleep" class="java.lang.String">
133
        <constructor-arg value="86400"/>
134
    </bean>
135

  
136
    <bean id="targetHour" class="java.lang.String">
137
        <constructor-arg  value="12"/>
138
    </bean>
139

  
140
    <bean id="targetMinute" class="java.lang.String">
141
        <constructor-arg  value="00"/>
142
    </bean>
143

  
144
    <bean id="targetSecond" class="java.lang.String">
145
        <constructor-arg value="00"/>
146
    </bean>
147

  
148
    <bean id="defaultFrequencyInHours" class="java.lang.String">
149
        <constructor-arg  value="24"/>
150
    </bean>
151
</beans>
modules/uoa-claims/trunk/src/test/java/eu/dnetlib/data/claims/TestClass.java
38 38
 * @author eri
39 39
 */
40 40
@RunWith(SpringJUnit4ClassRunner.class)
41
@ContextConfiguration(locations = {"./springContext-claimsDemo.xml"})
42
@PropertySource("./springContext-claimsDemo.properties")
41
@ContextConfiguration(locations = {"springContext-claims.xml"})
42
@PropertySource("springContext-claims.properties")
43 43
public class TestClass {
44 44
	private Logger log = Logger.getLogger(this.getClass());
45 45

  
......
66 66
    @Before
67 67
	public void init() throws Exception {
68 68
		BasicConfigurator.configure();
69
        ApplicationContext context = new ClassPathXmlApplicationContext("eu/dnetlib/data/claims/springContext-claimsDemo.xml");
69
        ApplicationContext context = new ClassPathXmlApplicationContext("eu/dnetlib/data/claims/springContext-claims.xml");
70 70

  
71 71
        directIndexHandler = context.getBean(DirectIndexHandler.class);
72 72
        projectHandler = context.getBean(ProjectHandler.class);
modules/uoa-claims/trunk/src/main/java/eu/dnetlib/data/claims/handler/FetchClaimHandler.java
26 26
    QueryGenerator queryGenerator = null;
27 27

  
28 28
    public FetchClaimHandler(){
29
//        ApplicationContext context = new ClassPathXmlApplicationContext("../claims/migration/springContext-claimsDemo.xml");
29
//        ApplicationContext context = new ClassPathXmlApplicationContext("../claims/migration/springContext-claims.xml");
30 30
//        sqlDAO = context.getBean(SqlDAO.class);
31 31

  
32 32
    }
modules/uoa-claims/trunk/src/main/resources/eu/dnetlib/data/claims/springContext-claims.properties
1

  
2
services.claims.db.driverClassName = org.postgresql.Driver
3
services.claims.db.url = jdbc:postgresql://scoobydoo.di.uoa.gr:5432/claims_www_last
4
services.claims.db.username = postgres
5
services.claims.db.password = snowflakes
6
services.claims.useProductionIndex = false
7

  
8
services.claims.communityAPI = https://dev-openaire.d4science.org/openaire/community/
9

  
10
#email properties
11
## EMAIL SETTINGS
12
services.claims.mail.host = smtp.gmail.com
13
services.claims.mail.port = 587
14
services.claims.mail.auth = true
15
services.claims.mail.from = invalid_email@email.com
16
services.claims.mail.username = invalid_email@email.com
17
services.claims.mail.password = invalid_password
18
services.claims.mail.specialRecipients = invalid_recipient@email.com
19
services.claims.mail.contactMail = openaire.test@gmail.com
20
services.claims.mail.openaireProjectClaimsPage = http://duffy.di.uoa.gr:4300/claims-project-manager?openaireId=
21
services.claims.mail.openaireCommunityClaimsPage = http://duffy.di.uoa.gr:4200/claims?communityId=
22
services.claims.mail.manageCommunityUserNotificationsPage = https://beta.admin.connect.openaire.eu/manage-user-notifications?communityId=
23

  
24
emailScheduler.sendEmailNotifications = false 
25

  
26
services.claims.results.pathToSaveRecord = /home/argirok/claims_www_last/records/
27
services.claims.reports.pathToSaveReport = /home/argirok/claims_www_last/reports/
28

  
29
#old version
30
#services.claims.directClaimAPIUrl = http://beta.services.openaire.eu:8280/is/mvc/api/publications
31
services.claims.directClaimAPIUrl = http://beta.services.openaire.eu:8980/provision/mvc/api/results
32

  
33

  
34
services.claims.mail.enabledCommunities = invalid_community_pid
modules/uoa-claims/trunk/src/main/resources/eu/dnetlib/data/claims/springContext-claims.xml
1
<?xml version="1.0" encoding="UTF-8"?>
2
<beans xmlns="http://www.springframework.org/schema/beans"
3
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4
       xsi:schemaLocation="
5
		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd "
6
       default-autowire="byName">
7
    <!--Un comment in order to run the tests / Comment to deploy-->
8
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
9
        <property name="locations" value="classpath:eu/dnetlib/data/claims/springContext-claims.properties"/>
10
    </bean>
11
    <bean id="directIndexHandler" class="eu.dnetlib.data.claims.handler.DirectIndexHandler">
12
        <property name="directClaimAPIUrl"  value="${services.claims.directClaimAPIUrl}"/>
13
    </bean>
14
    <bean id="fetchClaimHandler" class="eu.dnetlib.data.claims.handler.FetchClaimHandler">
15
        <property name="sqlDAO" ref="sqlDao"/>
16
        <property name="queryGenerator" ref="queryGenerator"/>
17

  
18
    </bean>
19
    <bean id="claimHandler" class="eu.dnetlib.data.claims.handler.ClaimHandler">
20
        <property name="sqlDAO" ref="sqlDao"/>
21
        <property name="queryGenerator" ref="queryGenerator"/>
22
        <property name="projectHandler" ref="projectHandler"/>
23
        <property name="resultHandler" ref="resultHandler"/>
24
        <property name="claimValidation" ref="claimValidation"/>
25
        <property name="useProductionIndex" value="${services.claims.useProductionIndex}"/>
26
    </bean>
27
    <bean id="externalRecordHandler" class="eu.dnetlib.data.claims.handler.ExternalRecordHandler">
28
        <property name="searchUtils" ref="searchUtils"/>
29
        <property name="externalRecordParser" ref="externalRecordParser"/>
30
    </bean>
31
    <bean id="fetchProjectHandler" class="eu.dnetlib.data.claims.handler.FetchProjectHandler">
32
        <property name="sqlDAO" ref="sqlDao"/>
33
        <property name="queryGenerator" ref="queryGenerator"/>
34

  
35
    </bean>
36

  
37
    <bean id="projectHandler" class="eu.dnetlib.data.claims.handler.ProjectHandler">
38
        <property name="searchUtils" ref="searchUtils"/>
39
        <property name="oafParser" ref="oafParser"/>
40
        <property name="queryGenerator" ref="queryGenerator"/>
41
        <property name="sqlDAO" ref="sqlDao"/>
42
    </bean>
43

  
44
    <bean id="fetchNotificationHandler" class="eu.dnetlib.data.claims.handler.FetchNotificationHandler">
45
        <property name="sqlDAO" ref="sqlDao"/>
46
        <property name="queryGenerator" ref="queryGenerator"/>
47

  
48
    </bean>
49

  
50
    <bean id="notificationHandler" class="eu.dnetlib.data.claims.handler.NotificationHandler">
51
        <property name="queryGenerator" ref="queryGenerator"/>
52
        <property name="sqlDAO" ref="sqlDao"/>
53
    </bean>
54

  
55
    <bean id="fetchContextHandler" class="eu.dnetlib.data.claims.handler.FetchContextHandler">
56
        <property name="sqlDAO" ref="sqlDao"/>
57
        <property name="queryGenerator" ref="queryGenerator"/>
58

  
59
    </bean>
60

  
61
    <bean id="indexResultHandler" class="eu.dnetlib.data.claims.handler.IndexResultHandler">
62
        <property name="searchUtils" ref="searchUtils"/>
63
    </bean>
64
    <bean id="resultHandler" class="eu.dnetlib.data.claims.handler.ResultHandler">
65
        <property name="sqlDAO" ref="sqlDao"/>
66
        <property name="queryGenerator" ref="queryGenerator"/>
67
        <!--<property name="pathToSaveRecord" value="/home/argirok/claims_beta/"/>-->
68
        <property name="pathToSaveRecord" value="${services.claims.results.pathToSaveRecord}"/>
69

  
70
    </bean>
71
    <!-- End of Handlers -->
72
    <!--Parsers -->
73
    <bean id="oafParser" class="eu.dnetlib.data.claims.parser.OafParser"></bean>
74
    <bean id="externalRecordParser" class="eu.dnetlib.data.claims.parser.ExternalRecordParser"></bean>
75
    <!-- end of Parsers -->
76
    <bean id="searchUtils" class="eu.dnetlib.data.claims.utils.SearchUtils"></bean>
77

  
78
    <bean id="claimValidation" class="eu.dnetlib.data.claims.utils.ClaimValidation">
79
        <property name="pathToSaveReport" value="${services.claims.reports.pathToSaveReport}"/>
80
    </bean>
81

  
82
    <bean id="emailSender" class="eu.dnetlib.data.emailSender.EmailSender">
83
        <property name="fetchClaimHandler" ref="fetchClaimHandler"/>
84
        <property name="fetchProjectHandler" ref="fetchProjectHandler"/>
85
        <property name="fetchNotificationHandler" ref="fetchNotificationHandler"/>
86
        <property name="notificationHandler" ref="notificationHandler"/>
87
        <property name="fetchContextHandler" ref="fetchContextHandler"/>
88
        <property name="manageCommunityUserNotificationsPage" value="${services.claims.mail.manageCommunityUserNotificationsPage}"/>
89
        <property name="openaireProjectClaimsPage" value="${services.claims.mail.openaireProjectClaimsPage}"/>
90
        <property name="openaireCommunityClaimsPage" value="${services.claims.mail.openaireCommunityClaimsPage}"/>
91
        <property name="username" value="${services.claims.mail.from}"/>
92
        <property name="password" value="${services.claims.mail.password}"/>
93
        <property name="host" value="${services.claims.mail.host}"/>
94
        <property name="port" value="${services.claims.mail.port}"/>
95
        <property name="auth" value="${services.claims.mail.auth}"/>
96
        <property name="from" value="${services.claims.mail.from}"/>
97
        <property name="contactMail" value="${services.claims.mail.contactMail}"/>
98
        <property name="specialRecipients" value="${services.claims.mail.specialRecipients}"/>
99
        <property name="defaultFrequencyInHours" ref="defaultFrequencyInHours"/>
100
        <property name="enabledCommunities" value="${services.claims.mail.enabledCommunities}"/>
101
    </bean>
102

  
103
    <bean id="CommunityUtils" class="eu.dnetlib.data.claims.utils.CommunityUtils">
104
        <property name="communityAPI" value="${services.claims.communityAPI}"/>
105
    </bean>
106
    
107
    <bean id="sqlStore" class="eu.dnetlib.data.claims.sql.SqlStore" init-method="init" destroy-method="destroy">
108
        <property name="dbUser" value="${services.claims.db.username}"/>
109
        <property name="dbPassword" value="${services.claims.db.password}"/>
110
        <property name="dbDriver" value="${services.claims.db.driverClassName}"/>
111
        <property name="dbUrl" value="${services.claims.db.url}"/>
112
    </bean>
113

  
114
    <bean id="sqlDao" class="eu.dnetlib.data.claims.sql.SqlDAO">
115
        <property name="sqlStore" ref="sqlStore"/>
116
    </bean>
117

  
118

  
119
    <bean id="queryGenerator" class="eu.dnetlib.data.claims.utils.QueryGenerator">
120
        <property name="updateOnInsert" value="true"/>
121
    </bean>
122

  
123
    <bean id="emailScheduler" class="eu.dnetlib.data.emailSender.EmailScheduler">
124
        <property name="sendEmailNotifications" value="${emailScheduler.sendEmailNotifications}"/>
125
        <property name="beautySleep" ref="beautySleep"/>
126
        <property name="targetHour" ref="targetHour"/>
127
        <property name="targetMinute" ref="targetMinute"/>
128
        <property name="targetSecond" ref="targetSecond"/>
129
        <property name="emailSender" ref="emailSender"/>
130
    </bean>
131

  
132
    <bean id="beautySleep" class="java.lang.String">
133
        <constructor-arg value="86400"/>
134
    </bean>
135

  
136
    <bean id="targetHour" class="java.lang.String">
137
        <constructor-arg  value="12"/>
138
    </bean>
139

  
140
    <bean id="targetMinute" class="java.lang.String">
141
        <constructor-arg  value="00"/>
142
    </bean>
143

  
144
    <bean id="targetSecond" class="java.lang.String">
145
        <constructor-arg value="00"/>
146
    </bean>
147

  
148
    <bean id="defaultFrequencyInHours" class="java.lang.String">
149
        <constructor-arg  value="24"/>
150
    </bean>
151
</beans>

Also available in: Unified diff