Revision 51141
Added by Panagiotis Kanakakis about 6 years ago
modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/services/ValidationServiceImpl.java | ||
---|---|---|
54 | 54 |
|
55 | 55 |
@PostConstruct |
56 | 56 |
public void initRulesets() { |
57 |
LOGGER.info("initializing validation service impl "); |
|
57 | 58 |
//this.loadRulesets(); |
58 | 59 |
} |
59 | 60 |
|
modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/config/FrontEndLinkURIAuthenticationSuccessHandler.java | ||
---|---|---|
30 | 30 |
|
31 | 31 |
LOGGER.debug(authentication.getName()); |
32 | 32 |
|
33 |
/*OIDCAuthenticationToken authOIDC = (OIDCAuthenticationToken) authentication;
|
|
33 |
OIDCAuthenticationToken authOIDC = (OIDCAuthenticationToken) authentication; |
|
34 | 34 |
Cookie sessionCookie = new Cookie("currentUser", authOIDC.getSub()); |
35 | 35 |
|
36 | 36 |
int expireSec = -1; |
37 | 37 |
sessionCookie.setMaxAge(expireSec); |
38 | 38 |
sessionCookie.setPath("/"); |
39 | 39 |
response.addCookie(sessionCookie); |
40 |
response.sendRedirect(frontEndURI);*/
|
|
40 |
response.sendRedirect(frontEndURI); |
|
41 | 41 |
} |
42 | 42 |
|
43 | 43 |
public String getFrontEndURI() { |
modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/config/Config.java | ||
---|---|---|
1 |
/* |
|
2 | 1 |
package eu.dnetlib.repo.manager.server.config; |
3 | 2 |
|
4 | 3 |
import org.apache.log4j.Logger; |
... | ... | |
20 | 19 |
|
21 | 20 |
private static Logger LOGGER = Logger.getLogger(Config.class); |
22 | 21 |
|
23 |
@Value("${rediss.host:localhost}")
|
|
22 |
@Value("${redis.host:194.177.192.121}")
|
|
24 | 23 |
private String host; |
25 | 24 |
|
26 |
@Value("${rediss.port:6379}")
|
|
25 |
@Value("${redis.port:6379}") |
|
27 | 26 |
private String port; |
28 | 27 |
|
29 |
@Value("${rediss.password:#{null}}")
|
|
28 |
@Value("${redis.password:#{null}}") |
|
30 | 29 |
private String password; |
31 | 30 |
|
32 | 31 |
@PostConstruct |
... | ... | |
49 | 48 |
DefaultCookieSerializer serializer = new DefaultCookieSerializer(); |
50 | 49 |
serializer.setCookieName("SESSION"); // <1> |
51 | 50 |
serializer.setCookiePath("/"); // <2> |
51 |
LOGGER.info("Serializer : " + serializer); |
|
52 | 52 |
return serializer; |
53 | 53 |
} |
54 | 54 |
|
55 | 55 |
} |
56 |
*/ |
modules/uoa-repository-manager-gui/branches/aai/src/main/resources/eu/dnetlib/repo/manager/server/config/springContext-repo-manager.xml | ||
---|---|---|
3 | 3 |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
4 | 4 |
xmlns:task="http://www.springframework.org/schema/task" |
5 | 5 |
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd |
6 |
|
|
7 | 6 |
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd" |
8 |
default-autowire="byType"> |
|
9 |
|
|
7 |
> |
|
10 | 8 |
<task:annotation-driven executor="myExecutor" scheduler="myScheduler"/> |
11 | 9 |
<task:executor id="myExecutor" pool-size="5"/> |
12 | 10 |
<task:scheduler id="myScheduler" pool-size="10"/> |
... | ... | |
22 | 20 |
<property name="mode" value="${services.validator.mail.mode}"/> |
23 | 21 |
<property name="debug" value="${services.validator.mail.debug}"/> |
24 | 22 |
</bean> |
23 |
|
|
24 |
|
|
25 |
<bean class="eu.dnetlib.repo.manager.server.config.CascadingPropertyLoader" |
|
26 |
id="propertyLoader"> |
|
27 |
<property name="order" value="2"/> |
|
28 |
<property name="properties"> |
|
29 |
<bean class="eu.dnetlib.conf.WebappContextProperyFactory"> |
|
30 |
<property name="propertyFetcher"> |
|
31 |
<bean class="eu.dnetlib.conf.PropertyFetcher"/> |
|
32 |
</property> |
|
33 |
</bean> |
|
34 |
</property> |
|
35 |
<property name="ignoreUnresolvablePlaceholders" value="true"/> |
|
36 |
<property name="locations"> |
|
37 |
<list> |
|
38 |
<value>classpath*:/gr/**/springContext-*.properties</value> |
|
39 |
<value>classpath*:/eu/**/springContext-*.properties</value> |
|
40 |
|
|
41 |
<value>classpath*:/eu/dnetlib/repo/manager/server/email-texts.properties</value> |
|
42 |
|
|
43 |
<value>classpath*:dnet-site-wizard.properties</value> |
|
44 |
<value>classpath*:dnet-site-override.properties</value> |
|
45 |
<value>classpath*:dnet-wizard.properties</value> |
|
46 |
<value>classpath*:dnet-override.properties</value> |
|
47 |
<value>classpath*:dnet-validator-wizard.properties</value> |
|
48 |
<value>classpath*:dnet-validator-override.properties</value> |
|
49 |
<value>classpath*:dnet-site-force-override.properties</value> |
|
50 |
<value>classpath*:dnet-force-override.properties</value> |
|
51 |
|
|
52 |
<value>classpath*:/eu/**/application.properties</value> |
|
53 |
|
|
54 |
</list> |
|
55 |
</property> |
|
56 |
</bean> |
|
57 |
|
|
25 | 58 |
</beans> |
modules/uoa-repository-manager-gui/branches/aai/src/main/resources/eu/dnetlib/repo/manager/server/config/aai-security.xml | ||
---|---|---|
13 | 13 |
<property name="maxUploadSize" value="268435456"/> |
14 | 14 |
</bean> |
15 | 15 |
|
16 |
<bean id="webexpressionHandler" |
|
17 |
class="org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler"/> |
|
18 |
|
|
16 | 19 |
<security:global-method-security pre-post-annotations="enabled" proxy-target-class="true" authentication-manager-ref="authenticationManager"/> |
17 | 20 |
|
18 | 21 |
<security:http auto-config="false" use-expressions="true" |
modules/uoa-repository-manager-gui/branches/aai/src/main/resources/eu/dnetlib/repo/manager/server/springContext-repo-manager.properties | ||
---|---|---|
1 |
## the address where validator is running and is accessible from the rest of the web |
|
2 |
#services.repo-manager.baseUrl = http://${container.hostname}:${container.port}/${container.context} |
|
3 |
# |
|
4 |
## base address for soap web services |
|
5 |
#transport.soap.baseAddress = http://${container.hostname}:${container.port}/${container.context} |
|
6 |
# |
|
7 |
#transport.soap.force.local.address = false |
|
8 |
# |
|
9 |
## the email of the administrator |
|
10 |
## he will receive all the automatic bug reports and feedback created |
|
11 |
#services.repo-manager.adminEmail = nikonas@di.uoa.gr |
|
12 |
# |
|
13 |
## if set to true, getRepositories will return dummy repositories |
|
14 |
#services.repo-manager.repository.testing.mode = false |
|
15 |
# |
|
16 |
#services.repo-manager.deploy.environment = development |
|
17 |
# |
|
18 |
## the mailhost for the mail service |
|
19 |
#services.validator.mail.host = smtp.gmail.com |
|
20 |
## the port where the mail service is running |
|
21 |
#services.validator.mail.port = 465 |
|
22 |
## the address that appears in the from field in the mails send by the validator |
|
23 |
#services.validator.mail.fromAddress = no-reply@openaire.eu |
|
24 |
## the reply-to field value in the mails send by the validator |
|
25 |
#services.validator.mail.replyToAddress = no-reply@openaire.eu |
|
26 |
## the username of the account used to login in the mail server |
|
27 |
#services.validator.mail.username = test.openaire@gmail.com |
|
28 |
## the password of the account used to login in the mail server |
|
29 |
#services.validator.mail.password = ^($*@$)*!$ |
|
30 |
## if authentication should take place |
|
31 |
## if set to false username and password is not needed |
|
32 |
#services.validator.mail.authenticate = true |
|
33 |
## is set to yes then all mails will not be sent to their targets but to the address specified in services.validator.mail.overrideEmail |
|
34 |
#services.validator.mail.override = false |
|
35 |
## if set to true then no mails are send, they are only logged as a debug message |
|
36 |
#services.validator.mail.logonly = false |
|
37 |
## the mode used for the mails send by the validator |
|
38 |
#services.validator.mail.mode = ssl |
|
39 |
## used by eu.dnetlib.utils.MailLibrary to control debuggin messages |
|
40 |
#services.validator.mail.debug = false |
|
41 |
## if services.validator.mail.override is true then all mails will be send only to this address |
|
42 |
#services.validator.mail.overrideEmail = nikonas@di.uoa.gr |
|
43 |
## a comma-seperated list of address that will receive all mails about validations and repo registrations |
|
44 |
#services.validator.mail.specialRecipients = nikonas@di.uoa.gr |
|
45 |
# |
|
46 |
## a comma-seperated list of addresses that have the ability to register repos without the need for validation and registration |
|
47 |
#services.validator.repoRegistration.override = nikonas@di.uoa.gr |
|
48 |
# |
|
49 |
# |
|
50 |
#repomanager.db.driverClassName = org.postgresql.Driver |
|
51 |
#repomanager.db.url = jdbc:postgresql://194.177.192.119:5432/repomanager |
|
52 |
#repomanager.db.username = dnet |
|
53 |
#repomanager.db.password = dnetPwd |
|
54 |
# |
|
55 |
#services.repomanager.analyticsURL = https://analytics.openaire.eu/addsite.php? |
|
56 |
# |
|
57 |
#services.repomanager.usageStatisticsDiagramsBaseURL = https://beta.openaire.eu/stats3/ |
|
58 |
#services.repomanager.usageStatisticsNumbersBaseURL = https://beta.services.openaire.eu/usagestats/datasources/ |
|
59 |
#services.repomanager.usagestats.adminEmail = repositoryusagestats@openaire.eu |
|
1 |
# the address where validator is running and is accessible from the rest of the web |
|
2 |
services.repo-manager.baseUrl = http://${container.hostname}:${container.port}/${container.context} |
|
60 | 3 |
|
4 |
# base address for soap web services |
|
5 |
transport.soap.baseAddress = http://${container.hostname}:${container.port}/${container.context} |
|
6 |
|
|
7 |
transport.soap.force.local.address = false |
|
8 |
|
|
9 |
# the email of the administrator |
|
10 |
# he will receive all the automatic bug reports and feedback created |
|
11 |
services.repo-manager.adminEmail = nikonas@di.uoa.gr |
|
12 |
|
|
13 |
# if set to true, getRepositories will return dummy repositories |
|
14 |
services.repo-manager.repository.testing.mode = false |
|
15 |
|
|
16 |
services.repo-manager.deploy.environment = development |
|
17 |
|
|
18 |
# the mailhost for the mail service |
|
19 |
services.validator.mail.host = smtp.gmail.com |
|
20 |
# the port where the mail service is running |
|
21 |
services.validator.mail.port = 465 |
|
22 |
# the address that appears in the from field in the mails send by the validator |
|
23 |
services.validator.mail.fromAddress = no-reply@openaire.eu |
|
24 |
# the reply-to field value in the mails send by the validator |
|
25 |
services.validator.mail.replyToAddress = no-reply@openaire.eu |
|
26 |
# the username of the account used to login in the mail server |
|
27 |
services.validator.mail.username = test.openaire@gmail.com |
|
28 |
# the password of the account used to login in the mail server |
|
29 |
services.validator.mail.password = ^($*@$)*!$ |
|
30 |
# if authentication should take place |
|
31 |
# if set to false username and password is not needed |
|
32 |
services.validator.mail.authenticate = true |
|
33 |
# is set to yes then all mails will not be sent to their targets but to the address specified in services.validator.mail.overrideEmail |
|
34 |
services.validator.mail.override = false |
|
35 |
# if set to true then no mails are send, they are only logged as a debug message |
|
36 |
services.validator.mail.logonly = false |
|
37 |
# the mode used for the mails send by the validator |
|
38 |
services.validator.mail.mode = ssl |
|
39 |
# used by eu.dnetlib.utils.MailLibrary to control debuggin messages |
|
40 |
services.validator.mail.debug = false |
|
41 |
# if services.validator.mail.override is true then all mails will be send only to this address |
|
42 |
services.validator.mail.overrideEmail = nikonas@di.uoa.gr |
|
43 |
# a comma-seperated list of address that will receive all mails about validations and repo registrations |
|
44 |
services.validator.mail.specialRecipients = nikonas@di.uoa.gr |
|
45 |
|
|
46 |
# a comma-seperated list of addresses that have the ability to register repos without the need for validation and registration |
|
47 |
services.validator.repoRegistration.override = nikonas@di.uoa.gr |
|
48 |
|
|
49 |
|
|
50 |
repomanager.db.driverClassName = org.postgresql.Driver |
|
51 |
repomanager.db.url = jdbc:postgresql://194.177.192.119:5432/repomanager |
|
52 |
repomanager.db.username = dnet |
|
53 |
repomanager.db.password = dnetPwd |
|
54 |
|
|
55 |
services.repomanager.analyticsURL = https://analytics.openaire.eu/addsite.php? |
|
56 |
|
|
57 |
services.repomanager.usageStatisticsDiagramsBaseURL = https://beta.openaire.eu/stats3/ |
|
58 |
services.repomanager.usageStatisticsNumbersBaseURL = https://beta.services.openaire.eu/usagestats/datasources/ |
|
59 |
services.repomanager.usagestats.adminEmail = repositoryusagestats@openaire.eu |
|
60 |
|
|
61 | 61 |
oidc.issuer = https://aai.openminted.eu/oidc/ |
62 | 62 |
oidc.id = 24e83176-1312-4ba3-bc0b-ffeebea1603e |
63 | 63 |
oidc.secret = U_gLOupYu2trYIOwfxGgZkkZoOHG_zGfaViOUsXcZ7qVQuF1rcJeQYKIDX1TY3z27CIoHaqq9ht2rmAiUmBRYQ |
64 |
webapp.home = http://localhost:8380/provider-user-management/openid_connect_login |
|
65 |
webapp.front=http://localhost:8380/repomanager-aai/#dashboard |
|
64 |
webapp.home = http://adonis.athenarc.gr:8080/repomanager-aai/openid_connect_login |
|
65 |
webapp.front= http://adonis.athenarc.gr:8080/repomanager-aai/#dashboard |
|
66 |
#webapp.home = http://localhost:8380/repomanager-aai/openid_connect_login |
|
67 |
#webapp.front= http://localhost:8380/repomanager-aai/#dashboard |
|
66 | 68 |
|
67 |
redis.host = 127.0.0.1 |
|
69 |
#redis.host = 127.0.0.1 |
modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/WEB-INF/applicationContext.xml | ||
---|---|---|
3 | 3 |
<beans xmlns="http://www.springframework.org/schema/beans" |
4 | 4 |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
5 | 5 |
xmlns:context="http://www.springframework.org/schema/context" |
6 |
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd |
|
7 |
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd"> |
|
6 |
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd |
|
7 |
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd" |
|
8 |
> |
|
8 | 9 |
|
9 | 10 |
|
10 | 11 |
|
... | ... | |
24 | 25 |
<import resource="classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml"/> |
25 | 26 |
<import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/> |
26 | 27 |
<import resource="classpath*:/eu/dnetlib/gwt/**/springContext-widgets.xml"/> |
28 |
<import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/> |
|
27 | 29 |
|
30 |
|
|
28 | 31 |
<import resource="classpath*:/eu/dnetlib/repo/manager/server/config/springContext-repo-manager.xml"/> |
29 |
<!--<import resource="classpath*:/eu/dnetlib/repo/manager/server/config/aai-security.xml"/> |
|
30 |
--> |
|
31 |
<import resource="classpath*:/eu/dnetlib/repos/springContext-repos-dms-cached.xml"/> |
|
32 |
<!--<import resource="classpath*:/eu/dnetlib/repo/manager/server/config/springContext-repo-manager-config.xml"/>--> |
|
33 |
<import resource="classpath*:/eu/dnetlib/repo/manager/server/config/aai-security.xml"/> |
|
34 |
|
|
35 |
|
|
32 | 36 |
<import resource="classpath*:application-context.xml" /> |
33 | 37 |
|
38 |
<context:annotation-config/> |
|
34 | 39 |
<context:component-scan base-package="eu.dnetlib.repo.manager.server"/> |
35 | 40 |
<context:component-scan base-package="eu.dnetlib.repo.manager.service.controllers"/> |
36 | 41 |
<!--<context:component-scan base-package="gr.uoa.di.driver"/>--> |
37 |
<context:annotation-config/> |
|
38 | 42 |
|
39 | 43 |
|
40 | 44 |
<bean class="eu.dnetlib.repo.manager.server.config.CascadingPropertyLoader" |
... | ... | |
53 | 57 |
<value>classpath*:/gr/**/springContext-*.properties</value> |
54 | 58 |
<value>classpath*:/eu/**/springContext-*.properties</value> |
55 | 59 |
|
56 |
|
|
57 | 60 |
<value>classpath*:/eu/dnetlib/repo/manager/server/email-texts.properties</value> |
58 | 61 |
|
59 |
|
|
60 | 62 |
<value>classpath*:dnet-site-wizard.properties</value> |
61 | 63 |
<value>classpath*:dnet-site-override.properties</value> |
62 | 64 |
<value>classpath*:dnet-wizard.properties</value> |
... | ... | |
71 | 73 |
</list> |
72 | 74 |
</property> |
73 | 75 |
</bean> |
74 |
|
|
75 | 76 |
</beans> |
modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/RepositoryManager.html | ||
---|---|---|
430 | 430 |
|
431 | 431 |
<ul class="uk-navbar-nav"> |
432 | 432 |
<li class="uk-parent"> |
433 |
<a class="loginLink" href="http://localhost:8380/repomanager-aai/openid_connect_login">
|
|
433 |
<a class="loginLink" href="http://adonis.athenarc.gr:8080/repomanager-aai/openid_connect_login">
|
|
434 | 434 |
<span class="uk-margin-small-right uk-icon"><svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"><circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle><path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path></svg> |
435 | 435 |
</span> |
436 | 436 |
Sign in | Register |
modules/uoa-repository-manager-gui/branches/aai/pom.xml | ||
---|---|---|
281 | 281 |
</dependency> |
282 | 282 |
|
283 | 283 |
|
284 |
<!-- <dependency>
|
|
284 |
<dependency> |
|
285 | 285 |
<groupId>org.springframework.session</groupId> |
286 | 286 |
<artifactId>spring-session-data-redis</artifactId> |
287 | 287 |
<version>1.3.1.RELEASE</version> |
... | ... | |
291 | 291 |
<groupId>redis.clients</groupId> |
292 | 292 |
<artifactId>jedis</artifactId> |
293 | 293 |
<version>2.9.0</version> |
294 |
</dependency>-->
|
|
294 |
</dependency> |
|
295 | 295 |
|
296 | 296 |
<dependency> |
297 | 297 |
<groupId>eu.dnetlib</groupId> |
298 | 298 |
<artifactId>uoa-repository-manager-service</artifactId> |
299 | 299 |
<version>1.0.0-SNAPSHOT</version> |
300 |
<exclusions> |
|
301 |
<exclusion> |
|
302 |
<groupId>org.slf4j</groupId> |
|
303 |
<artifactId>slf4j-log4j12</artifactId> |
|
304 |
</exclusion> |
|
305 |
</exclusions> |
|
300 | 306 |
</dependency> |
301 | 307 |
</dependencies> |
302 | 308 |
|
Also available in: Unified diff
AAI/Redis configuration ready.