Project

General

Profile

« Previous | Next » 

Revision 45489

View differences:

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/ProjectCoordinator.java
1
package eu.dnetlib.goldoa.domain;
2

  
3
import java.io.Serializable;
4
import javax.persistence.*;
5

  
6

  
7
/**
8
 * The persistent class for the project_coordinator database table.
9
 * 
10
 */
11
@Entity
12
@Table(name="project_coordinator")
13
@NamedQuery(name="ProjectCoordinator.findAll", query="SELECT p FROM ProjectCoordinator p")
14
public class ProjectCoordinator implements Serializable {
15
	private static final long serialVersionUID = 1L;
16

  
17
	
18
	@Id
19
	@ManyToOne
20
    @JoinColumn(name = "coordinator")
21
	private User coordinator;
22

  
23
	@Id
24
	@ManyToOne
25
    @JoinColumn(name = "project")
26
	private Project project;
27

  
28
	public ProjectCoordinator() {
29
	}
30

  
31
	public User getCoordinator() {
32
		return this.coordinator;
33
	}
34

  
35
	public void setCoordinator(User coordinator) {
36
		this.coordinator = coordinator;
37
	}
38

  
39
	public Project getProject() {
40
		return this.project;
41
	}
42

  
43
	public void setProject(Project project) {
44
		this.project = project;
45
	}
46

  
47
}
modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/ProjectOrganization.java
1
package eu.dnetlib.goldoa.domain;
2

  
3
import java.io.Serializable;
4
import javax.persistence.*;
5

  
6

  
7
/**
8
 * The persistent class for the project_organization database table.
9
 * 
10
 */
11
@Entity
12
@Table(name="project_organization")
13
@NamedQuery(name="ProjectOrganization.findAll", query="SELECT p FROM ProjectOrganization p")
14
public class ProjectOrganization implements Serializable {
15
	private static final long serialVersionUID = 1L;
16

  
17
	@Id
18
	@ManyToOne
19
    @JoinColumn(name = "organization")
20
	private Organization organization;
21

  
22
	@Id
23
	@ManyToOne
24
    @JoinColumn(name = "project")
25
	private Project project;
26

  
27
	public ProjectOrganization() {
28
	}
29

  
30
	public Organization getOrganization() {
31
		return this.organization;
32
	}
33

  
34
	public void setOrganization(Organization organization) {
35
		this.organization = organization;
36
	}
37

  
38
	public Project getProject() {
39
		return this.project;
40
	}
41

  
42
	public void setProject(Project project) {
43
		this.project = project;
44
	}
45

  
46
}
modules/uoa-goldoa-service/branches/hibernate/.idea/misc.xml
7 7
      </list>
8 8
    </option>
9 9
  </component>
10
  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
10 11
  <component name="SvnBranchConfigurationManager">
11 12
    <option name="mySupportsUserInfoFilter" value="true" />
12 13
  </component>
modules/uoa-goldoa-service/branches/hibernate/.idea/workspace.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<project version="4">
3 3
  <component name="ChangeListManager">
4
    <list default="true" id="4bbb13c0-0220-440c-bdf5-585ab94ee653" name="Default" comment="" />
4
    <list default="true" readonly="true" id="4bbb13c0-0220-440c-bdf5-585ab94ee653" name="Default" comment="">
5
      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/ProjectCoordinator.java" afterPath="" />
6
      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/ProjectOrganization.java" afterPath="" />
7
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
8
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
10
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java" />
11
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java" />
12
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Project.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Project.java" />
13
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java" />
14
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Role.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Role.java" />
15
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java" />
16
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java" />
17
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java" />
18
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java" />
19
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java" />
20
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java" />
21
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java" />
22
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java" afterPath="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java" />
23
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java" afterPath="$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java" />
24
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml" afterPath="$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml" />
25
    </list>
5 26
    <ignored path="$PROJECT_DIR$/target/" />
6 27
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7 28
    <option name="TRACKING_ENABLED" value="true" />
......
18 39
    <favorites_list name="uoa-goldoa-service" />
19 40
  </component>
20 41
  <component name="FileEditorManager">
21
    <leaf />
42
    <leaf>
43
      <file leaf-file-name="ProjectManagerImpl.java" pinned="false" current-in-tab="false">
44
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java">
45
          <provider selected="true" editor-type-id="text-editor">
46
            <state relative-caret-position="-90">
47
              <caret line="7" column="40" lean-forward="true" selection-start-line="7" selection-start-column="40" selection-end-line="7" selection-end-column="40" />
48
              <folding />
49
            </state>
50
          </provider>
51
        </entry>
52
      </file>
53
      <file leaf-file-name="Affiliation.java" pinned="false" current-in-tab="false">
54
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java">
55
          <provider selected="true" editor-type-id="text-editor">
56
            <state relative-caret-position="108">
57
              <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="15" selection-end-column="68" />
58
              <folding />
59
            </state>
60
          </provider>
61
        </entry>
62
      </file>
63
      <file leaf-file-name="AffiliationPK.java" pinned="false" current-in-tab="false">
64
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/AffiliationPK.java">
65
          <provider selected="true" editor-type-id="text-editor">
66
            <state relative-caret-position="180">
67
              <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
68
              <folding />
69
            </state>
70
          </provider>
71
        </entry>
72
      </file>
73
      <file leaf-file-name="UserRolePK.java" pinned="false" current-in-tab="false">
74
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRolePK.java">
75
          <provider selected="true" editor-type-id="text-editor">
76
            <state relative-caret-position="90">
77
              <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
78
              <folding />
79
            </state>
80
          </provider>
81
        </entry>
82
      </file>
83
      <file leaf-file-name="UserRole.java" pinned="false" current-in-tab="true">
84
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRole.java">
85
          <provider selected="true" editor-type-id="text-editor">
86
            <state relative-caret-position="468">
87
              <caret line="34" column="20" lean-forward="true" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
88
              <folding />
89
            </state>
90
          </provider>
91
        </entry>
92
      </file>
93
      <file leaf-file-name="UserDAO.java" pinned="false" current-in-tab="false">
94
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java">
95
          <provider selected="true" editor-type-id="text-editor">
96
            <state relative-caret-position="227">
97
              <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
98
              <folding>
99
                <element signature="imports" expanded="true" />
100
              </folding>
101
            </state>
102
          </provider>
103
        </entry>
104
      </file>
105
      <file leaf-file-name="ProjectDAO.java" pinned="false" current-in-tab="false">
106
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java">
107
          <provider selected="true" editor-type-id="text-editor">
108
            <state relative-caret-position="376">
109
              <caret line="109" column="13" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
110
              <folding>
111
                <marker date="1484828278998" expanded="true" signature="50:673" ph="..." />
112
                <marker date="1484828278998" expanded="true" signature="4221:4226" ph=" { " />
113
                <marker date="1484828278998" expanded="true" signature="4258:4261" ph=" }" />
114
                <marker date="1484828278998" expanded="true" signature="4308:5364" ph="{...}" />
115
                <marker date="1484828278998" expanded="true" signature="4312:4476" ph="//..." />
116
                <marker date="1484828278998" expanded="true" signature="5411:5544" ph="{...}" />
117
                <marker date="1484828278998" expanded="true" signature="5580:5585" ph=" { " />
118
                <marker date="1484828278998" expanded="true" signature="5603:5606" ph=" }" />
119
                <marker date="1484828278998" expanded="true" signature="5657:5662" ph=" { " />
120
                <marker date="1484828278998" expanded="true" signature="5691:5694" ph=" }" />
121
                <marker date="1484828278998" expanded="true" signature="5776:5957" ph="{...}" />
122
                <marker date="1484828278998" expanded="true" signature="6045:6199" ph="{...}" />
123
                <marker date="1484828278998" expanded="true" signature="6231:6236" ph=" { " />
124
                <marker date="1484828278998" expanded="true" signature="6256:6259" ph=" }" />
125
                <marker date="1484828278998" expanded="true" signature="6308:6313" ph=" { " />
126
                <marker date="1484828278998" expanded="true" signature="6346:6349" ph=" }" />
127
              </folding>
128
            </state>
129
          </provider>
130
        </entry>
131
      </file>
132
      <file leaf-file-name="OrganizationDAO.java" pinned="false" current-in-tab="false">
133
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java">
134
          <provider selected="true" editor-type-id="text-editor">
135
            <state relative-caret-position="-414">
136
              <caret line="54" column="19" lean-forward="true" selection-start-line="48" selection-start-column="7" selection-end-line="54" selection-end-column="19" />
137
              <folding />
138
            </state>
139
          </provider>
140
        </entry>
141
      </file>
142
      <file leaf-file-name="Project.java" pinned="false" current-in-tab="false">
143
        <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Project.java">
144
          <provider selected="true" editor-type-id="text-editor">
145
            <state relative-caret-position="360">
146
              <caret line="63" column="76" lean-forward="false" selection-start-line="63" selection-start-column="76" selection-end-line="63" selection-end-column="76" />
147
              <folding>
148
                <element signature="e#2053#2054#0" expanded="true" />
149
                <element signature="e#2076#2077#0" expanded="true" />
150
                <element signature="e#2113#2114#0" expanded="true" />
151
                <element signature="e#2136#2137#0" expanded="true" />
152
              </folding>
153
            </state>
154
          </provider>
155
        </entry>
156
      </file>
157
    </leaf>
22 158
  </component>
23 159
  <component name="FileTemplateManagerImpl">
24 160
    <option name="RECENT_TEMPLATES">
......
43 179
  <component name="IdeDocumentHistory">
44 180
    <option name="CHANGED_PATHS">
45 181
      <list>
46
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java" />
47 182
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/HelpManagerImpl.java" />
48 183
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/utils/Scheduler.java" />
49 184
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRolePK.java" />
50
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Role.java" />
51 185
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublicationAffiliation.java" />
52 186
        <option value="$PROJECT_DIR$/src/test/java/unitest/TestUserDAO.java" />
53 187
        <option value="$PROJECT_DIR$/src/test/java/unitest/TestUserSystemUtils.java" />
54 188
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/UserManagerImpl.java" />
55
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java" />
56
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java" />
57 189
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManager.java" />
58
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java" />
59
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java" />
60
        <option value="$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml" />
61 190
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManagerImpl.java" />
62
        <option value="$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java" />
63
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java" />
64 191
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/AffiliationPK.java" />
65 192
        <option value="$PROJECT_DIR$/src/test/java/unitest/UserActionsTest.java" />
66
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java" />
67
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java" />
68 193
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublicationIdentifier.java" />
69 194
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Author.java" />
70 195
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Identifier.java" />
71
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java" />
72 196
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java" />
73 197
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublicationDAO.java" />
74
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java" />
75 198
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publisher.java" />
76 199
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java" />
77 200
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublisherDAO.java" />
201
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java" />
202
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java" />
203
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java" />
204
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java" />
205
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java" />
206
        <option value="$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml" />
207
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java" />
208
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Project.java" />
209
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java" />
210
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java" />
211
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java" />
212
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java" />
213
        <option value="$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java" />
214
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java" />
215
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Role.java" />
216
        <option value="$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRole.java" />
78 217
      </list>
79 218
    </option>
80 219
  </component>
......
103 242
      <foldersAlwaysOnTop value="true" />
104 243
    </navigator>
105 244
    <panes>
106
      <pane id="PackagesPane" />
107
      <pane id="Scope" />
108
      <pane id="Scratches" />
109 245
      <pane id="ProjectPane">
110 246
        <subPane>
111 247
          <PATH>
......
131 267
              <option name="myItemId" value="src" />
132 268
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
133 269
            </PATH_ELEMENT>
270
            <PATH_ELEMENT>
271
              <option name="myItemId" value="test" />
272
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
273
            </PATH_ELEMENT>
134 274
          </PATH>
135 275
          <PATH>
136 276
            <PATH_ELEMENT>
......
146 286
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
147 287
            </PATH_ELEMENT>
148 288
            <PATH_ELEMENT>
289
              <option name="myItemId" value="test" />
290
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
291
            </PATH_ELEMENT>
292
            <PATH_ELEMENT>
293
              <option name="myItemId" value="java" />
294
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
295
            </PATH_ELEMENT>
296
            <PATH_ELEMENT>
297
              <option name="myItemId" value="unitest" />
298
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
299
            </PATH_ELEMENT>
300
          </PATH>
301
          <PATH>
302
            <PATH_ELEMENT>
303
              <option name="myItemId" value="uoa-goldoa-service" />
304
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
305
            </PATH_ELEMENT>
306
            <PATH_ELEMENT>
307
              <option name="myItemId" value="uoa-goldoa-service" />
308
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
309
            </PATH_ELEMENT>
310
            <PATH_ELEMENT>
311
              <option name="myItemId" value="src" />
312
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
313
            </PATH_ELEMENT>
314
            <PATH_ELEMENT>
149 315
              <option name="myItemId" value="main" />
150 316
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
151 317
            </PATH_ELEMENT>
......
197 363
              <option name="myItemId" value="goldoa" />
198 364
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
199 365
            </PATH_ELEMENT>
366
            <PATH_ELEMENT>
367
              <option name="myItemId" value="service" />
368
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
369
            </PATH_ELEMENT>
200 370
          </PATH>
201 371
          <PATH>
202 372
            <PATH_ELEMENT>
......
224 394
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
225 395
            </PATH_ELEMENT>
226 396
            <PATH_ELEMENT>
397
              <option name="myItemId" value="service" />
398
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
399
            </PATH_ELEMENT>
400
            <PATH_ELEMENT>
401
              <option name="myItemId" value="dao" />
402
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
403
            </PATH_ELEMENT>
404
          </PATH>
405
          <PATH>
406
            <PATH_ELEMENT>
407
              <option name="myItemId" value="uoa-goldoa-service" />
408
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
409
            </PATH_ELEMENT>
410
            <PATH_ELEMENT>
411
              <option name="myItemId" value="uoa-goldoa-service" />
412
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
413
            </PATH_ELEMENT>
414
            <PATH_ELEMENT>
415
              <option name="myItemId" value="src" />
416
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
417
            </PATH_ELEMENT>
418
            <PATH_ELEMENT>
419
              <option name="myItemId" value="main" />
420
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
421
            </PATH_ELEMENT>
422
            <PATH_ELEMENT>
423
              <option name="myItemId" value="java" />
424
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
425
            </PATH_ELEMENT>
426
            <PATH_ELEMENT>
427
              <option name="myItemId" value="goldoa" />
428
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
429
            </PATH_ELEMENT>
430
            <PATH_ELEMENT>
227 431
              <option name="myItemId" value="domain" />
228 432
              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
229 433
            </PATH_ELEMENT>
230 434
          </PATH>
231 435
        </subPane>
232 436
      </pane>
437
      <pane id="Scratches" />
438
      <pane id="Scope" />
439
      <pane id="PackagesPane" />
233 440
    </panes>
234 441
  </component>
235 442
  <component name="PropertiesComponent">
......
570 777
    <servers />
571 778
  </component>
572 779
  <component name="TestHistory">
573
    <history-entry file="UserActionsTest - 2017.01.17 at 16h 49m 55s.xml">
574
      <configuration name="UserActionsTest" configurationId="JUnit" />
780
    <history-entry file="Unnamed - 2017.01.19 at 16h 25m 21s.xml">
781
      <configuration name="Unnamed" configurationId="JUnit" />
575 782
    </history-entry>
576
    <history-entry file="UserActionsTest - 2017.01.17 at 16h 56m 54s.xml">
577
      <configuration name="UserActionsTest" configurationId="JUnit" />
783
    <history-entry file="Unnamed - 2017.01.19 at 16h 27m 06s.xml">
784
      <configuration name="Unnamed" configurationId="JUnit" />
578 785
    </history-entry>
579
    <history-entry file="UserActionsTest - 2017.01.17 at 16h 58m 58s.xml">
580
      <configuration name="UserActionsTest" configurationId="JUnit" />
786
    <history-entry file="Unnamed - 2017.01.19 at 16h 28m 33s.xml">
787
      <configuration name="Unnamed" configurationId="JUnit" />
581 788
    </history-entry>
582
    <history-entry file="UserActionsTest - 2017.01.17 at 16h 59m 23s.xml">
583
      <configuration name="UserActionsTest" configurationId="JUnit" />
789
    <history-entry file="Unnamed - 2017.01.19 at 16h 33m 44s.xml">
790
      <configuration name="Unnamed" configurationId="JUnit" />
584 791
    </history-entry>
585
    <history-entry file="UserActionsTest - 2017.01.17 at 22h 55m 43s.xml">
586
      <configuration name="UserActionsTest" configurationId="JUnit" />
792
    <history-entry file="Unnamed - 2017.01.19 at 16h 34m 00s.xml">
793
      <configuration name="Unnamed" configurationId="JUnit" />
587 794
    </history-entry>
588
    <history-entry file="UserActionsTest - 2017.01.17 at 22h 56m 07s.xml">
589
      <configuration name="UserActionsTest" configurationId="JUnit" />
795
    <history-entry file="Unnamed - 2017.01.19 at 16h 41m 25s.xml">
796
      <configuration name="Unnamed" configurationId="JUnit" />
590 797
    </history-entry>
591
    <history-entry file="UserActionsTest - 2017.01.17 at 22h 57m 55s.xml">
798
    <history-entry file="UserActionsTest - 2017.01.19 at 16h 31m 13s.xml">
592 799
      <configuration name="UserActionsTest" configurationId="JUnit" />
593 800
    </history-entry>
594
    <history-entry file="UserActionsTest - 2017.01.17 at 23h 00m 46s.xml">
801
    <history-entry file="UserActionsTest - 2017.01.19 at 16h 33m 24s.xml">
595 802
      <configuration name="UserActionsTest" configurationId="JUnit" />
596 803
    </history-entry>
597
    <history-entry file="UserActionsTest - 2017.01.17 at 23h 01m 47s.xml">
804
    <history-entry file="UserActionsTest - 2017.01.19 at 16h 33m 33s.xml">
598 805
      <configuration name="UserActionsTest" configurationId="JUnit" />
599 806
    </history-entry>
600
    <history-entry file="UserActionsTest - 2017.01.17 at 23h 23m 12s.xml">
807
    <history-entry file="UserActionsTest - 2017.01.19 at 16h 41m 40s.xml">
601 808
      <configuration name="UserActionsTest" configurationId="JUnit" />
602 809
    </history-entry>
603 810
  </component>
......
612 819
  </component>
613 820
  <component name="ToolWindowManager">
614 821
    <frame x="0" y="0" width="1366" height="738" extended-state="6" />
615
    <editor active="false" />
822
    <editor active="true" />
616 823
    <layout>
617 824
      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
618 825
      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32952693" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
619 826
      <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
827
      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43882546" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
620 828
      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
621 829
      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
622 830
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
623 831
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43882546" sideWeight="0.5030303" order="7" side_tool="true" content_ui="tabs" />
624 832
      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
833
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32789558" sideWeight="0.49707174" order="7" side_tool="false" content_ui="tabs" />
625 834
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.9820555" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
626
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32789558" sideWeight="0.49707174" order="7" side_tool="false" content_ui="tabs" />
627 835
      <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
628 836
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32952693" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
629 837
      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
630 838
      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
631
      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34318182" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
839
      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2621212" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
840
      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32626426" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
632 841
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
633 842
      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
634 843
      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
635 844
      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
845
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
636 846
      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
637
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
638 847
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
639 848
      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
640 849
      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
641 850
      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
642
      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43882546" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
643 851
      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
644
      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32626426" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
645 852
    </layout>
646 853
  </component>
647 854
  <component name="VcsContentAnnotationSettings">
......
661 868
    <option name="FILTER_TARGETS" value="false" />
662 869
  </component>
663 870
  <component name="editorHistoryManager">
664
    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java">
871
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/utils/EmailUtilsImpl.java">
665 872
      <provider selected="true" editor-type-id="text-editor">
666
        <state relative-caret-position="0">
873
        <state relative-caret-position="-1890">
667 874
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
668 875
        </state>
669 876
      </provider>
670 877
    </entry>
671
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java">
878
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Vocabulary.java">
672 879
      <provider selected="true" editor-type-id="text-editor">
673
        <state relative-caret-position="36">
674
          <caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
880
        <state relative-caret-position="126">
881
          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
675 882
        </state>
676 883
      </provider>
677 884
    </entry>
678
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/utils/Scheduler.java">
885
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/OrganizationManagerException.java">
679 886
      <provider selected="true" editor-type-id="text-editor">
680
        <state relative-caret-position="183">
681
          <caret line="20" column="14" lean-forward="true" selection-start-line="20" selection-start-column="14" selection-end-line="20" selection-end-column="14" />
887
        <state relative-caret-position="306">
888
          <caret line="19" column="37" lean-forward="false" selection-start-line="19" selection-start-column="37" selection-end-line="19" selection-end-column="37" />
682 889
        </state>
683 890
      </provider>
684 891
    </entry>
685
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/HelpManagerImpl.java">
892
    <entry file="file://$PROJECT_DIR$/src/test/resources/dataSource.xml">
686 893
      <provider selected="true" editor-type-id="text-editor">
687
        <state relative-caret-position="18">
688
          <caret line="13" column="5" lean-forward="false" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
894
        <state relative-caret-position="0">
895
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
689 896
        </state>
690 897
      </provider>
691 898
    </entry>
692
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Role.java">
899
    <entry file="file://$PROJECT_DIR$/src/test/resources/applicationContext-goldoa-service-test.xml">
693 900
      <provider selected="true" editor-type-id="text-editor">
694
        <state relative-caret-position="288">
695
          <caret line="20" column="60" lean-forward="true" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="60" />
901
        <state relative-caret-position="0">
902
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
696 903
        </state>
697 904
      </provider>
698 905
    </entry>
699
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRolePK.java">
906
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManager.java">
700 907
      <provider selected="true" editor-type-id="text-editor">
701 908
        <state relative-caret-position="198">
702
          <caret line="15" column="22" lean-forward="true" selection-start-line="15" selection-start-column="22" selection-end-line="15" selection-end-column="22" />
909
          <caret line="14" column="57" lean-forward="false" selection-start-line="14" selection-start-column="57" selection-end-line="14" selection-end-column="57" />
703 910
        </state>
704 911
      </provider>
705 912
    </entry>
706
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/PublicationAffiliation.java" />
707
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRole.java">
913
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/UserManager.java">
708 914
      <provider selected="true" editor-type-id="text-editor">
709 915
        <state relative-caret-position="126">
710
          <caret line="9" column="25" lean-forward="false" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
916
          <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
711 917
        </state>
712 918
      </provider>
713 919
    </entry>
714
    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/TestUserActions.java" />
715
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/utils/EmailUtilsImpl.java">
920
    <entry file="file://$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
921
    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
716 922
      <provider selected="true" editor-type-id="text-editor">
717
        <state relative-caret-position="-1890">
923
        <state relative-caret-position="0">
718 924
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
719 925
        </state>
720 926
      </provider>
721 927
    </entry>
722
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Vocabulary.java">
928
    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserActionsTest.java">
723 929
      <provider selected="true" editor-type-id="text-editor">
724
        <state relative-caret-position="126">
725
          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
930
        <state relative-caret-position="430">
931
          <caret line="112" column="13" lean-forward="true" selection-start-line="112" selection-start-column="13" selection-end-line="112" selection-end-column="13" />
932
          <folding>
933
            <element signature="imports" expanded="false" />
934
          </folding>
726 935
        </state>
727 936
      </provider>
728 937
    </entry>
729
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/OrganizationManagerException.java">
938
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication_Author.java" />
939
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Author.java">
730 940
      <provider selected="true" editor-type-id="text-editor">
731 941
        <state relative-caret-position="306">
732
          <caret line="19" column="37" lean-forward="false" selection-start-line="19" selection-start-column="37" selection-end-line="19" selection-end-column="37" />
942
          <caret line="33" column="42" lean-forward="false" selection-start-line="33" selection-start-column="42" selection-end-line="33" selection-end-column="42" />
943
          <folding />
733 944
        </state>
734 945
      </provider>
735 946
    </entry>
736
    <entry file="file://$PROJECT_DIR$/src/test/resources/dataSource.xml">
947
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Identifier.java">
737 948
      <provider selected="true" editor-type-id="text-editor">
738
        <state relative-caret-position="0">
739
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
949
        <state relative-caret-position="326">
950
          <caret line="28" column="5" lean-forward="false" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
951
          <folding>
952
            <element signature="imports" expanded="false" />
953
          </folding>
740 954
        </state>
741 955
      </provider>
742 956
    </entry>
743
    <entry file="file://$PROJECT_DIR$/src/test/resources/applicationContext-goldoa-service-test.xml">
957
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java">
744 958
      <provider selected="true" editor-type-id="text-editor">
745
        <state relative-caret-position="0">
746
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
959
        <state relative-caret-position="430">
960
          <caret line="199" column="0" lean-forward="true" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" />
961
          <folding>
962
            <element signature="e#3720#3721#0" expanded="false" />
963
            <element signature="e#3768#3769#0" expanded="false" />
964
          </folding>
747 965
        </state>
748 966
      </provider>
749 967
    </entry>
750
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManager.java">
968
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManager.java">
751 969
      <provider selected="true" editor-type-id="text-editor">
752
        <state relative-caret-position="198">
753
          <caret line="14" column="57" lean-forward="false" selection-start-line="14" selection-start-column="57" selection-end-line="14" selection-end-column="57" />
970
        <state relative-caret-position="126">
971
          <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
754 972
        </state>
755 973
      </provider>
756 974
    </entry>
757
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/UserManager.java">
975
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Currency.java">
758 976
      <provider selected="true" editor-type-id="text-editor">
759 977
        <state relative-caret-position="126">
760
          <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
978
          <caret line="7" column="12" lean-forward="false" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
979
          <folding />
761 980
        </state>
762 981
      </provider>
763 982
    </entry>
764
    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java">
983
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManager.java">
765 984
      <provider selected="true" editor-type-id="text-editor">
766
        <state relative-caret-position="36">
767
          <caret line="52" column="36" lean-forward="true" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
985
        <state relative-caret-position="324">
986
          <caret line="19" column="23" lean-forward="false" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
768 987
        </state>
769 988
      </provider>
770 989
    </entry>
771
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java">
990
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublisherDAO.java">
772 991
      <provider selected="true" editor-type-id="text-editor">
773
        <state relative-caret-position="196">
774
          <caret line="14" column="26" lean-forward="true" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" />
992
        <state relative-caret-position="288">
993
          <caret line="16" column="24" lean-forward="false" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
775 994
        </state>
776 995
      </provider>
777 996
    </entry>
778
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/AffiliationPK.java">
997
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publisher.java">
779 998
      <provider selected="true" editor-type-id="text-editor">
780
        <state relative-caret-position="234">
781
          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
999
        <state relative-caret-position="430">
1000
          <caret line="50" column="32" lean-forward="false" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="32" />
1001
          <folding>
1002
            <element signature="e#3243#3244#0" expanded="false" />
1003
            <element signature="e#3265#3266#0" expanded="false" />
1004
            <element signature="e#3312#3313#0" expanded="false" />
1005
            <element signature="e#3343#3344#0" expanded="false" />
1006
          </folding>
782 1007
        </state>
783 1008
      </provider>
784 1009
    </entry>
785
    <entry file="file://$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" />
786
    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
1010
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetDAO.java">
787 1011
      <provider selected="true" editor-type-id="text-editor">
788 1012
        <state relative-caret-position="0">
789 1013
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
790 1014
        </state>
791 1015
      </provider>
792 1016
    </entry>
793
    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserActionsTest.java">
1017
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublicationDAO.java">
794 1018
      <provider selected="true" editor-type-id="text-editor">
795
        <state relative-caret-position="430">
796
          <caret line="112" column="13" lean-forward="true" selection-start-line="112" selection-start-column="13" selection-end-line="112" selection-end-column="13" />
1019
        <state relative-caret-position="108">
1020
          <caret line="24" column="67" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="67" />
797 1021
          <folding>
798
            <element signature="imports" expanded="true" />
1022
            <element signature="imports" expanded="false" />
799 1023
          </folding>
800 1024
        </state>
801 1025
      </provider>
802 1026
    </entry>
803
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/UserManagerImpl.java">
1027
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/Searchable.java">
804 1028
      <provider selected="true" editor-type-id="text-editor">
805
        <state relative-caret-position="450">
806
          <caret line="44" column="19" lean-forward="false" selection-start-line="44" selection-start-column="4" selection-end-line="44" selection-end-column="19" />
807
          <folding />
1029
        <state relative-caret-position="126">
1030
          <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
808 1031
        </state>
809 1032
      </provider>
810 1033
    </entry>
811
    <entry file="file://$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml">
1034
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManagerImpl.java">
812 1035
      <provider selected="true" editor-type-id="text-editor">
813
        <state relative-caret-position="72">
814
          <caret line="22" column="64" lean-forward="false" selection-start-line="22" selection-start-column="64" selection-end-line="22" selection-end-column="64" />
1036
        <state relative-caret-position="-34">
1037
          <caret line="40" column="47" lean-forward="false" selection-start-line="40" selection-start-column="47" selection-end-line="40" selection-end-column="47" />
1038
        </state>
1039
      </provider>
1040
    </entry>
1041
    <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
1042
      <provider selected="true" editor-type-id="text-editor">
1043
        <state relative-caret-position="0">
1044
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
815 1045
          <folding />
816 1046
        </state>
817 1047
      </provider>
818 1048
    </entry>
819
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java">
1049
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/SearchManagerImpl.java">
820 1050
      <provider selected="true" editor-type-id="text-editor">
821
        <state relative-caret-position="522">
822
          <caret line="63" column="0" lean-forward="false" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
1051
        <state relative-caret-position="34">
1052
          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
823 1053
          <folding />
824 1054
        </state>
825 1055
      </provider>
826 1056
    </entry>
827
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java">
1057
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/RequestManagerImpl.java">
828 1058
      <provider selected="true" editor-type-id="text-editor">
829
        <state relative-caret-position="216">
830
          <caret line="22" column="28" lean-forward="true" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="28" />
1059
        <state relative-caret-position="0">
1060
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1061
          <folding>
1062
            <element signature="e#0#24709#0" expanded="false" />
1063
          </folding>
1064
        </state>
1065
      </provider>
1066
    </entry>
1067
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java">
1068
      <provider selected="true" editor-type-id="text-editor">
1069
        <state relative-caret-position="124">
1070
          <caret line="27" column="27" lean-forward="false" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
1071
          <folding>
1072
            <element signature="imports" expanded="false" />
1073
          </folding>
1074
        </state>
1075
      </provider>
1076
    </entry>
1077
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManager.java">
1078
      <provider selected="true" editor-type-id="text-editor">
1079
        <state relative-caret-position="126">
1080
          <caret line="10" column="17" lean-forward="false" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
831 1081
          <folding />
832 1082
        </state>
833 1083
      </provider>
834 1084
    </entry>
835
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication_Author.java" />
836
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Author.java">
1085
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/InvoiceManagerImpl.java">
837 1086
      <provider selected="true" editor-type-id="text-editor">
838
        <state relative-caret-position="306">
839
          <caret line="33" column="42" lean-forward="false" selection-start-line="33" selection-start-column="42" selection-end-line="33" selection-end-column="42" />
1087
        <state relative-caret-position="0">
1088
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
840 1089
          <folding />
841 1090
        </state>
842 1091
      </provider>
843 1092
    </entry>
844
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java">
1093
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/ProjectOrganization.java">
845 1094
      <provider selected="true" editor-type-id="text-editor">
846
        <state relative-caret-position="232">
847
          <caret line="52" column="17" lean-forward="false" selection-start-line="52" selection-start-column="17" selection-end-line="52" selection-end-column="17" />
1095
        <state relative-caret-position="216">
1096
          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
848 1097
          <folding />
849 1098
        </state>
850 1099
      </provider>
851 1100
    </entry>
852
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java">
1101
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManager.java">
853 1102
      <provider selected="true" editor-type-id="text-editor">
854
        <state relative-caret-position="1224">
855
          <caret line="98" column="5" lean-forward="false" selection-start-line="98" selection-start-column="5" selection-end-line="98" selection-end-column="5" />
1103
        <state relative-caret-position="126">
1104
          <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
1105
          <folding />
856 1106
        </state>
857 1107
      </provider>
858 1108
    </entry>
859
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Identifier.java">
1109
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java">
860 1110
      <provider selected="true" editor-type-id="text-editor">
861
        <state relative-caret-position="326">
862
          <caret line="28" column="5" lean-forward="false" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
863
          <folding>
864
            <element signature="imports" expanded="true" />
865
          </folding>
1111
        <state relative-caret-position="144">
1112
          <caret line="18" column="8" lean-forward="false" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
1113
          <folding />
866 1114
        </state>
867 1115
      </provider>
868 1116
    </entry>
869
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Journal.java">
1117
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Organization.java">
870 1118
      <provider selected="true" editor-type-id="text-editor">
871
        <state relative-caret-position="430">
872
          <caret line="199" column="0" lean-forward="true" selection-start-line="199" selection-start-column="0" selection-end-line="199" selection-end-column="0" />
1119
        <state relative-caret-position="592">
1120
          <caret line="100" column="40" lean-forward="false" selection-start-line="100" selection-start-column="40" selection-end-line="100" selection-end-column="40" />
873 1121
          <folding>
874
            <element signature="e#3720#3721#0" expanded="true" />
875
            <element signature="e#3768#3769#0" expanded="true" />
1122
            <element signature="e#2314#2315#0" expanded="true" />
1123
            <element signature="e#2366#2367#0" expanded="true" />
1124
            <element signature="e#2397#2398#0" expanded="true" />
876 1125
          </folding>
877 1126
        </state>
878 1127
      </provider>
879 1128
    </entry>
880
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManager.java">
1129
    <entry file="file://$PROJECT_DIR$/src/test/resources/hibernate-cfg.xml">
881 1130
      <provider selected="true" editor-type-id="text-editor">
882
        <state relative-caret-position="126">
883
          <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
1131
        <state relative-caret-position="360">
1132
          <caret line="38" column="61" lean-forward="false" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
1133
          <folding />
884 1134
        </state>
885 1135
      </provider>
886 1136
    </entry>
887
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Currency.java">
1137
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/ProjectCoordinator.java">
888 1138
      <provider selected="true" editor-type-id="text-editor">
889
        <state relative-caret-position="126">
890
          <caret line="7" column="12" lean-forward="false" selection-start-line="7" selection-start-column="12" selection-end-line="7" selection-end-column="12" />
1139
        <state relative-caret-position="216">
1140
          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
891 1141
          <folding />
892 1142
        </state>
893 1143
      </provider>
894 1144
    </entry>
895
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManager.java">
1145
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java">
896 1146
      <provider selected="true" editor-type-id="text-editor">
897
        <state relative-caret-position="324">
898
          <caret line="19" column="23" lean-forward="false" selection-start-line="19" selection-start-column="23" selection-end-line="19" selection-end-column="23" />
1147
        <state relative-caret-position="-9">
1148
          <caret line="94" column="61" lean-forward="false" selection-start-line="94" selection-start-column="61" selection-end-line="94" selection-end-column="61" />
1149
          <folding />
899 1150
        </state>
900 1151
      </provider>
901 1152
    </entry>
902
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublisherDAO.java">
1153
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java">
903 1154
      <provider selected="true" editor-type-id="text-editor">
904
        <state relative-caret-position="288">
905
          <caret line="16" column="24" lean-forward="false" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
1155
        <state relative-caret-position="94">
1156
          <caret line="30" column="8" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="8" />
906 1157
          <folding>
907 1158
            <element signature="imports" expanded="true" />
1159
            <element signature="method#deletePublicationRelations#0;class#PublicationManagerImpl#0" expanded="false" />
908 1160
          </folding>
909 1161
        </state>
910 1162
      </provider>
911 1163
    </entry>
912
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java">
1164
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/JournalDAO.java">
913 1165
      <provider selected="true" editor-type-id="text-editor">
914
        <state relative-caret-position="146">
915
          <caret line="44" column="101" lean-forward="true" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="101" />
1166
        <state relative-caret-position="-808">
1167
          <caret line="20" column="11" lean-forward="false" selection-start-line="20" selection-start-column="11" selection-end-line="20" selection-end-column="11" />
916 1168
          <folding />
917 1169
        </state>
918 1170
      </provider>
919 1171
    </entry>
920
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publication.java">
1172
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/OrganizationDAO.java">
921 1173
      <provider selected="true" editor-type-id="text-editor">
922
        <state relative-caret-position="637">
923
          <caret line="84" column="32" lean-forward="true" selection-start-line="84" selection-start-column="4" selection-end-line="84" selection-end-column="32" />
1174
        <state relative-caret-position="-414">
1175
          <caret line="54" column="19" lean-forward="true" selection-start-line="48" selection-start-column="7" selection-end-line="54" selection-end-column="19" />
924 1176
          <folding />
925 1177
        </state>
926 1178
      </provider>
927 1179
    </entry>
928
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Publisher.java">
1180
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/ProjectDAO.java">
929 1181
      <provider selected="true" editor-type-id="text-editor">
930
        <state relative-caret-position="430">
931
          <caret line="50" column="32" lean-forward="false" selection-start-line="50" selection-start-column="32" selection-end-line="50" selection-end-column="32" />
1182
        <state relative-caret-position="376">
1183
          <caret line="109" column="13" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
932 1184
          <folding>
933
            <element signature="e#3243#3244#0" expanded="true" />
934
            <element signature="e#3265#3266#0" expanded="true" />
935
            <element signature="e#3312#3313#0" expanded="true" />
936
            <element signature="e#3343#3344#0" expanded="true" />
1185
            <marker date="1484828278998" expanded="true" signature="50:673" ph="..." />
1186
            <marker date="1484828278998" expanded="true" signature="4221:4226" ph=" { " />
1187
            <marker date="1484828278998" expanded="true" signature="4258:4261" ph=" }" />
1188
            <marker date="1484828278998" expanded="true" signature="4308:5364" ph="{...}" />
1189
            <marker date="1484828278998" expanded="true" signature="4312:4476" ph="//..." />
1190
            <marker date="1484828278998" expanded="true" signature="5411:5544" ph="{...}" />
1191
            <marker date="1484828278998" expanded="true" signature="5580:5585" ph=" { " />
1192
            <marker date="1484828278998" expanded="true" signature="5603:5606" ph=" }" />
1193
            <marker date="1484828278998" expanded="true" signature="5657:5662" ph=" { " />
1194
            <marker date="1484828278998" expanded="true" signature="5691:5694" ph=" }" />
1195
            <marker date="1484828278998" expanded="true" signature="5776:5957" ph="{...}" />
1196
            <marker date="1484828278998" expanded="true" signature="6045:6199" ph="{...}" />
1197
            <marker date="1484828278998" expanded="true" signature="6231:6236" ph=" { " />
1198
            <marker date="1484828278998" expanded="true" signature="6256:6259" ph=" }" />
1199
            <marker date="1484828278998" expanded="true" signature="6308:6313" ph=" { " />
1200
            <marker date="1484828278998" expanded="true" signature="6346:6349" ph=" }" />
937 1201
          </folding>
938 1202
        </state>
939 1203
      </provider>
940 1204
    </entry>
941
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/BudgetDAO.java">
1205
    <entry file="file://$PROJECT_DIR$/src/test/java/unitest/UserSystemUtilsTest.java">
942 1206
      <provider selected="true" editor-type-id="text-editor">
943
        <state relative-caret-position="0">
944
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1207
        <state relative-caret-position="34">
1208
          <caret line="72" column="0" lean-forward="true" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
1209
          <folding />
945 1210
        </state>
946 1211
      </provider>
947 1212
    </entry>
948
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/PublicationDAO.java">
1213
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java">
949 1214
      <provider selected="true" editor-type-id="text-editor">
950
        <state relative-caret-position="108">
951
          <caret line="24" column="67" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="67" />
952
          <folding>
953
            <element signature="imports" expanded="true" />
954
          </folding>
1215
        <state relative-caret-position="-90">
1216
          <caret line="7" column="40" lean-forward="true" selection-start-line="7" selection-start-column="40" selection-end-line="7" selection-end-column="40" />
1217
          <folding />
955 1218
        </state>
956 1219
      </provider>
957 1220
    </entry>
958
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/SearchManagerImpl.java">
1221
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/User.java">
959 1222
      <provider selected="true" editor-type-id="text-editor">
960
        <state relative-caret-position="126">
961
          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
1223
        <state relative-caret-position="162">
1224
          <caret line="16" column="12" lean-forward="false" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
1225
          <folding />
962 1226
        </state>
963 1227
      </provider>
964 1228
    </entry>
965
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/Searchable.java">
1229
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Role.java">
966 1230
      <provider selected="true" editor-type-id="text-editor">
967
        <state relative-caret-position="126">
968
          <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
1231
        <state relative-caret-position="162">
1232
          <caret line="13" column="12" lean-forward="false" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
1233
          <folding />
969 1234
        </state>
970 1235
      </provider>
971 1236
    </entry>
972
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublicationManagerImpl.java">
1237
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java">
973 1238
      <provider selected="true" editor-type-id="text-editor">
974
        <state relative-caret-position="3870">
975
          <caret line="240" column="27" lean-forward="false" selection-start-line="240" selection-start-column="27" selection-end-line="240" selection-end-column="27" />
1239
        <state relative-caret-position="227">
1240
          <caret line="178" column="0" lean-forward="true" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
976 1241
          <folding>
977 1242
            <element signature="imports" expanded="true" />
978
            <element signature="method#deletePublicationRelations#0;class#PublicationManagerImpl#0" expanded="false" />
979 1243
          </folding>
980 1244
        </state>
981 1245
      </provider>
982 1246
    </entry>
983
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/PublisherManagerImpl.java">
1247
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/UserManagerImpl.java">
984 1248
      <provider selected="true" editor-type-id="text-editor">
985
        <state relative-caret-position="486">
986
          <caret line="27" column="27" lean-forward="false" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
987
          <folding>
988
            <element signature="imports" expanded="true" />
989
          </folding>
1249
        <state relative-caret-position="-738">
1250
          <caret line="44" column="19" lean-forward="false" selection-start-line="44" selection-start-column="4" selection-end-line="44" selection-end-column="19" />
1251
          <folding />
990 1252
        </state>
991 1253
      </provider>
992 1254
    </entry>
993
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/RequestManagerImpl.java">
1255
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Project.java">
994 1256
      <provider selected="true" editor-type-id="text-editor">
995
        <state relative-caret-position="0">
996
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1257
        <state relative-caret-position="360">
1258
          <caret line="63" column="76" lean-forward="false" selection-start-line="63" selection-start-column="76" selection-end-line="63" selection-end-column="76" />
997 1259
          <folding>
998
            <element signature="e#0#24709#0" expanded="true" />
1260
            <element signature="e#2053#2054#0" expanded="true" />
1261
            <element signature="e#2076#2077#0" expanded="true" />
1262
            <element signature="e#2113#2114#0" expanded="true" />
1263
            <element signature="e#2136#2137#0" expanded="true" />
999 1264
          </folding>
1000 1265
        </state>
1001 1266
      </provider>
1002 1267
    </entry>
1003
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/OrganizationManagerImpl.java">
1268
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRolePK.java">
1004 1269
      <provider selected="true" editor-type-id="text-editor">
1005
        <state relative-caret-position="-34">
1006
          <caret line="40" column="47" lean-forward="false" selection-start-line="40" selection-start-column="47" selection-end-line="40" selection-end-column="47" />
1270
        <state relative-caret-position="90">
1271
          <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
1272
          <folding />
1007 1273
        </state>
1008 1274
      </provider>
1009 1275
    </entry>
1010
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/JournalManagerImpl.java">
1276
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/AffiliationPK.java">
1011 1277
      <provider selected="true" editor-type-id="text-editor">
1012
        <state relative-caret-position="124">
1013
          <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
1278
        <state relative-caret-position="180">
1279
          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
1014 1280
          <folding />
1015 1281
        </state>
1016 1282
      </provider>
1017 1283
    </entry>
1018
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/InvoiceManagerImpl.java">
1284
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/Affiliation.java">
1019 1285
      <provider selected="true" editor-type-id="text-editor">
1020
        <state relative-caret-position="-1690">
1021
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1022
        </state>
1023
      </provider>
1024
    </entry>
1025
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/service/ProjectManagerImpl.java">
1026
      <provider selected="true" editor-type-id="text-editor">
1027
        <state relative-caret-position="18">
1028
          <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
1286
        <state relative-caret-position="108">
1287
          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="15" selection-end-column="68" />
1029 1288
          <folding />
1030 1289
        </state>
1031 1290
      </provider>
1032 1291
    </entry>
1033
    <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
1292
    <entry file="file://$PROJECT_DIR$/src/main/java/eu/dnetlib/goldoa/domain/UserRole.java">
1034 1293
      <provider selected="true" editor-type-id="text-editor">
1035
        <state relative-caret-position="0">
1036
          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1294
        <state relative-caret-position="468">
1295
          <caret line="34" column="20" lean-forward="true" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
1037 1296
          <folding />
1038 1297
        </state>
1039 1298
      </provider>
modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/UserSystemUtilsTest.java
46 46
		 
47 47
		User sys_user = null;
48 48
		try {
49
			sys_user = um.login(user.getEmail(),user.getPassword());
49
			sys_user = um.login("pkanakakis@di.uoa.gr",user.getPassword());
50 50
		} catch (PersonManagerException e) {
51 51
			//e.printStackTrace();
52 52
		}
modules/uoa-goldoa-service/branches/hibernate/src/test/resources/hibernate-cfg.xml
37 37
		<mapping class = "eu.dnetlib.goldoa.domain.Commenttemplate"/>
38 38
		<mapping class = "eu.dnetlib.goldoa.domain.OrganizationBudget"/>
39 39
		<mapping class = "eu.dnetlib.goldoa.domain.Project"/>
40
		<mapping class = "eu.dnetlib.goldoa.domain.ProjectCoordinator"/>
41
		<mapping class = "eu.dnetlib.goldoa.domain.ProjectOrganization"/>
42 40
		<mapping class = "eu.dnetlib.goldoa.domain.PublisherDiscount"/>
43 41
		<mapping class = "eu.dnetlib.goldoa.domain.AccountAction"/>
44 42
		<mapping class = "eu.dnetlib.goldoa.domain.Request"/>
......
46 44
		<mapping class = "eu.dnetlib.goldoa.domain.RequestCofunder"/>
47 45
		<mapping class = "eu.dnetlib.goldoa.domain.RequestComment"/>
48 46
		<mapping class = "eu.dnetlib.goldoa.domain.Identifier"/>
49
		<!--<mapping class = "eu.dnetlib.goldoa.domain.PublicationAffiliation"/>-->
50
		<mapping class = "eu.dnetlib.goldoa.domain.Publication_Author"/>
51 47
		<mapping class = "eu.dnetlib.goldoa.domain.Author"/>
52 48
    </session-factory>
53 49
</hibernate-configuration>
modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java
1 1
package eu.dnetlib.goldoa.service.dao;
2 2

  
3 3
import eu.dnetlib.goldoa.domain.AccountAction;
4
import eu.dnetlib.goldoa.domain.Affiliation;
5
import eu.dnetlib.goldoa.domain.Budget;
6
import eu.dnetlib.goldoa.domain.Organization;
7 4
import eu.dnetlib.goldoa.domain.UserRole;
8
import eu.dnetlib.goldoa.domain.UserRolePK;
9
import eu.dnetlib.goldoa.domain.Project;
10
import eu.dnetlib.goldoa.domain.ProjectCoordinator;
11
import eu.dnetlib.goldoa.domain.Publisher;
12 5
import eu.dnetlib.goldoa.domain.Role;
13 6
import eu.dnetlib.goldoa.domain.User;
14
import eu.dnetlib.goldoa.service.UserManagerImpl;
15 7

  
16 8
import org.apache.commons.codec.digest.DigestUtils;
17 9
import org.hibernate.Criteria;
18
import org.hibernate.Query;
19
import org.hibernate.criterion.Order;
10
import org.hibernate.Hibernate;
20 11
import org.hibernate.criterion.Restrictions;
21
import org.springframework.beans.factory.annotation.Autowired;
22
/*import org.springframework.jdbc.core.BatchPreparedStatementSetter;
23
import org.springframework.jdbc.core.JdbcTemplate;
24
import org.springframework.jdbc.core.PreparedStatementSetter;
25
import org.springframework.jdbc.core.RowMapper;*/
12
import org.hibernate.type.StringType;
26 13
import org.springframework.stereotype.Repository;
27
import org.springframework.transaction.annotation.Transactional;
28 14

  
29
import javax.sql.DataSource;
30
import java.sql.PreparedStatement;
31 15
import java.sql.ResultSet;
32 16
import java.sql.SQLException;
33 17
import java.sql.Timestamp;
34
import java.sql.Types;
35 18
import java.util.ArrayList;
36
import java.util.Date;
37 19
import java.util.List;
38 20

  
39 21
/**
40 22
 * Created by antleb on 3/13/15.
41 23
 */
42 24
@Repository
43
public class UserDAO extends AbstractDao<String, User>{
44
	/**
45
	 * Returns the person with the given id. Objects of different type are placeholders containing only their id.
46
	 * Objects representing relations are fully initialized, with placeholders for other main entities.
47
	 *
48
	 * @param userId
49
	 * @return
50
	 */
51
	public User getUserById(String userId) {
52
		return (User) createEntityCriteria().add(Restrictions.ilike("id", userId)).list().get(0);
53
	}
25
public class UserDAO extends AbstractDao<String, User> {
26
    /**
27
     * Returns the person with the given id. Objects of different type are placeholders containing only their id.
28
     * Objects representing relations are fully initialized, with placeholders for other main entities.
29
     *
30
     * @param userId
31
     * @return
32
     */
33
    public User getUserById(String userId) {
34
        return (User) createEntityCriteria().add(Restrictions.eq("id", userId)).list().get(0);
35
    }
54 36

  
55
	/**
56
	 * Returns the person with the given email. Objects of different type are placeholders containing only their id.
57
	 * Objects representing relations are fully initialized, with placeholders for other main entities.
58
	 *
59
	 * @param email
60
	 * @return
61
	 */
62
	@SuppressWarnings("unchecked")
63
	public User getUserByEmail(String email) {
64
		List<User> users = createEntityCriteria().add(Restrictions.eq("email", email)).list();
65
		if(users.size() == 0)
66
			return null;
67
		return (User) users.get(0);
68
	}
37
    /**
38
     * Returns the person with the given email. Objects of different type are placeholders containing only their id.
39
     * Objects representing relations are fully initialized, with placeholders for other main entities.
40
     *
41
     * @param email
42
     * @return
43
     */
44
    @SuppressWarnings("unchecked")
45
    public User getUserByEmail(String email) {
46
        List<User> users = createEntityCriteria().add(Restrictions.eq("email", email)).list();
47
        if (users.size() == 0)
48
            return null;
49
        return users.get(0);
50
    }
69 51

  
70
	public void saveToken(final String email, final String token, final int tokenTTL) {
71
		AccountAction acc_action = new AccountAction();
72
		acc_action.setUser(getUserByEmail(email));
73
		acc_action.setType("activation");
74
		acc_action.setToken(token);
75
		acc_action.setDate(new Timestamp(System.currentTimeMillis()));
76
		acc_action.setExpires(new Timestamp(System.currentTimeMillis() + 1000L * 60L * 60L * 24L * tokenTTL));
77
		getSession().persist(acc_action);
78
	}
52
    public void saveToken(final String email, final String token, final int tokenTTL) {
53
        AccountAction acc_action = new AccountAction();
54
        acc_action.setUser(getUserByEmail(email));
55
        acc_action.setType("activation");
56
        acc_action.setToken(token);
57
        acc_action.setDate(new Timestamp(System.currentTimeMillis()));
58
        acc_action.setExpires(new Timestamp(System.currentTimeMillis() + 1000L * 60L * 60L * 24L * tokenTTL));
59
        getSession().persist(acc_action);
60
    }
79 61

  
80
	public boolean verifyLogin(String email, String password) {
81
		List users = createEntityCriteria().add(Restrictions.eq("email", email)).list();
82
		//		.add(Restrictions.eq("password", DigestUtils.md5Hex(password))).list();
83
		
84
		if(users.size() != 0)
85
			return true;
86
		return false;
87
	}
62
    public boolean verifyLogin(String email, String password) {
63
        List users = createEntityCriteria().add(Restrictions.eq("email", email)).list();
64
        //		.add(Restrictions.eq("password", DigestUtils.md5Hex(password))).list();
88 65

  
89
	@SuppressWarnings("unchecked")
90
	public boolean verifyToken(final String email, final String token) {
91
		Criteria cr = getSession().createCriteria(AccountAction.class);
92
		List<AccountAction> ac = cr.add(Restrictions.eq("email", email))
93
				.add(Restrictions.eq("token", token)).list();
94
		if(ac.size() > 0)
95
			return true;
96
		return false;		
97
	}
66
        if (users.size() != 0)
67
            return true;
68
        return false;
69
    }
98 70

  
99
	public void activateUser(final String email) {		
100
		User user = (User) createEntityCriteria().add(Restrictions.eq("email", email)).list().get(0);
101
		user.setActive(true);
102
		getSession().update(user);
103
	}
71
    @SuppressWarnings("unchecked")
72
    public boolean verifyToken(final String email, final String token) {
73
        Criteria cr = getSession().createCriteria(AccountAction.class);
74
        List<AccountAction> ac = cr.add(Restrictions.eq("email", email))
75
                .add(Restrictions.eq("token", token)).list();
76
        if (ac.size() > 0)
77
            return true;
78
        return false;
79
    }
104 80

  
105
	public void deleteToken(final String email, final String token) {		
106
		Criteria cr = getSession().createCriteria(AccountAction.class);
107
		AccountAction ac = (AccountAction) cr.add(Restrictions.eq("email", email))
108
				.add(Restrictions.eq("token", token))
109
				.add(Restrictions.eq("type", "activation")).list().get(0);
110
		getSession().delete(ac);
111
	}
81
    public void activateUser(final String email) {
82
        User user = (User) createEntityCriteria().add(Restrictions.eq("email", email)).list().get(0);
83
        user.setActive(true);
84
        getSession().update(user);
85
    }
112 86

  
113
	@SuppressWarnings("unchecked")
114
	public boolean updatePassword(final String newPassword, final String email) {
115
		List<User> rs = createEntityCriteria().add(Restrictions.eq("email", email)).list();
116
		if(rs.get(0) != null){
117
			User user = rs.get(0);
118
			user.setPassword(DigestUtils.md5Hex(newPassword));
119
			getSession().update(user);
120
			return true;
121
		}
122
		return false;
123
		
124
	}
87
    public void deleteToken(final String email, final String token) {
88
        Criteria cr = getSession().createCriteria(AccountAction.class);
89
        AccountAction ac = (AccountAction) cr.add(Restrictions.eq("email", email))
90
                .add(Restrictions.eq("token", token))
91
                .add(Restrictions.eq("type", "activation")).list().get(0);
92
        getSession().delete(ac);
93
    }
125 94

  
126
	@SuppressWarnings("unchecked")
127
	public List<Role> getRoles() {		
128
		Criteria cr = getSession().createCriteria(Role.class);
129
		return cr.list();
130
	}
95
    @SuppressWarnings("unchecked")
96
    public boolean updatePassword(final String newPassword, final String email) {
97
        List<User> rs = createEntityCriteria().add(Restrictions.eq("email", email)).list();
98
        if (rs.get(0) != null) {
99
            User user = rs.get(0);
100
            user.setPassword(DigestUtils.md5Hex(newPassword));
101
            getSession().update(user);
102
            return true;
103
        }
104
        return false;
131 105

  
132
	public void saveUser(final User user) {
133
		for(UserRole ur : user.getRoles()){
134
			Role r = ur.getPk().getRole();
135
			getSession().persist(r);
136
		}
137
		persist(user);
138
	}
106
    }
139 107

  
140
	//TODO MOVE TO PROJECT DAO
108
    @SuppressWarnings("unchecked")
109
    public List<Role> getRoles() {
110
        Criteria cr = getSession().createCriteria(Role.class);
111
        return cr.list();
112
    }
113

  
114
    public void saveUser(final User user) {
115
        for (UserRole ur : user.getRoles()) {
116
            Role r = ur.getPk().getRole();
117
            getSession().persist(r);
118
        }
119
        persist(user);
120
    }
121

  
122
    //TODO MOVE TO PROJECT DAO
141 123
	/*public void removeProjectCoordinators(final String email) {
142 124
		Criteria cr = getSession().createCriteria(ProjectCoordinator.class);
143 125
		ProjectCoordinator pc = (ProjectCoordinator) cr.add(Restrictions.eq("email",email)).list().get(0);
......
158 140
	}*/
159 141

  
160 142

  
161
	@SuppressWarnings("unchecked")
162
	public List<User> getUsersByRole(String role_id) {
143
    @SuppressWarnings("unchecked")
144
    public List<User> getUsersByRole(String role_id) {
163 145

  
164
		Criteria cr = getSession().createCriteria(Role.class);
165
		Role role = (Role) cr.add(Restrictions.eq("id",role_id)).list().get(0);
166
		cr = getSession().createCriteria(UserRole.class);
146
        Criteria cr = getSession().createCriteria(Role.class);
147
        Role role = (Role) cr.add(Restrictions.eq("id", role_id)).list().get(0);
148
        cr = getSession().createCriteria(UserRole.class);
167 149

  
168
		List<UserRole> rs = cr.add(Restrictions.eq("approved", true))
169
				.add(Restrictions.eq("pk.role", role)).list();
150
        List<UserRole> rs = cr.add(Restrictions.eq("approved", true))
151
                .add(Restrictions.eq("pk.role", role)).list();
170 152

  
171 153

  
172
		List<User> users = new ArrayList<>();
173
		for(UserRole ur : rs)
174
			users.add(ur.getPk().getUser());
175
		return users;
176
	}
177
	
178
	public List<User> getModerators() {	
179
		return getUsersByRole("moderator");
180
	}
154
        List<User> users = new ArrayList<>();
155
        for (UserRole ur : rs)
156
            users.add(ur.getPk().getUser());
157
        return users;
158
    }
181 159

  
182
	public List<User> getAccountingOfficers() {
183
		return getUsersByRole("accounting");
184
	}
160
    public List<User> getModerators() {
161
        return getUsersByRole("moderator");
162
    }
185 163

  
186
	public Role getRole(final String roleId) {
187
		Criteria cr = getSession().createCriteria(Role.class);
188
		cr.add(Restrictions.eq("id", roleId));
189
		return (Role) cr.list().get(0);
190
	}
164
    public List<User> getAccountingOfficers() {
165
        return getUsersByRole("accounting");
166
    }
191 167

  
192
	public void deactivateUser(String email) {
193
		User user = (User) createEntityCriteria().add(Restrictions.eq("email", email)).list().get(0);
194
		user.setActive(false);
195
		getSession().update(user);
196
	}
168
    public Role getRole(final String roleId) {
169
        Criteria cr = getSession().createCriteria(Role.class);
170
        cr.add(Restrictions.eq("id", roleId));
171
        return (Role) cr.list().get(0);
172
    }
197 173

  
198
	public void acceptUserRole(String email, String roleId) {
199
		changeRoleApprovedStatus(email,roleId,true);
200
	}
174
    public void deactivateUser(String email) {
175
        User user = (User) createEntityCriteria().add(Restrictions.eq("email", email)).list().get(0);
176
        user.setActive(false);
177
        getSession().update(user);
178
    }
201 179

  
202
	public void rejectUserRole(String email, String roleId) {
203
		changeRoleApprovedStatus(email,roleId,false);
204
	}
180
    public void acceptUserRole(String email, String roleId) {
181
        changeRoleApprovedStatus(email, roleId, true);
182
    }
205 183

  
206
	public void changeRoleApprovedStatus(String email,String roleId,boolean status){
207
		Criteria cr = getSession().createCriteria(UserRole.class);
208
		User user = getUserByEmail(email);
209
		Role role = getRole(roleId);
210
		UserRole ur = (UserRole) cr.add(Restrictions.eq("pk.user", user))
211
				.add(Restrictions.eq("pk.role", role)).list().get(0);
184
    public void rejectUserRole(String email, String roleId) {
185
        changeRoleApprovedStatus(email, roleId, false);
186
    }
212 187

  
213
		ur.setApproved(status);
214
		getSession().update(ur);
215
	}
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff