Revision 57535
Added by Antonis Lempesis over 4 years ago
| modules/uoa-repository-manager-service/trunk/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java | ||
|---|---|---|
| 3 | 3 |
import com.fasterxml.jackson.core.JsonProcessingException; |
| 4 | 4 |
import com.fasterxml.jackson.databind.ObjectMapper; |
| 5 | 5 |
import com.fasterxml.jackson.databind.SerializationFeature; |
| 6 |
import eu.dnetlib.domain.data.PiwikInfo; |
|
| 6 | 7 |
import eu.dnetlib.domain.data.Repository; |
| 7 | 8 |
import eu.dnetlib.domain.data.RepositoryInterface; |
| 8 | 9 |
import eu.dnetlib.repo.manager.domain.RepositorySnippet; |
| ... | ... | |
| 283 | 284 |
//Map<String,String> identity = new HashMap<>(); |
| 284 | 285 |
|
| 285 | 286 |
if (repository.getPiwikInfo() != null) {
|
| 286 |
Map<String, Object> identities = new HashMap<>(); |
|
| 287 |
Map<String, Object> identity = new HashMap<>(); |
|
| 288 |
HashSet<Map<String, Object>> identities = new HashSet<>(); |
|
| 287 | 289 |
|
| 288 |
identities.put("issuertype", "piwik");
|
|
| 289 |
identities.put("pid", "piwik:" + repository.getPiwikInfo().getSiteId());
|
|
| 290 |
identity.put("issuertype", "piwik");
|
|
| 291 |
identity.put("pid", "piwik:" + repository.getPiwikInfo().getSiteId());
|
|
| 290 | 292 |
|
| 293 |
identities.add(identity); |
|
| 294 |
|
|
| 291 | 295 |
repositoryMap.put("identities", identities);
|
| 292 | 296 |
} |
| 293 | 297 |
|
| modules/uoa-repository-manager-service/trunk/src/main/webapp/WEB-INF/applicationContext.xml | ||
|---|---|---|
| 55 | 55 |
<value>classpath*:/application.properties</value> |
| 56 | 56 |
<value>classpath*:/email-texts.properties</value> |
| 57 | 57 |
|
| 58 |
<!-- <value>classpath*:dnet-site-wizard.properties</value>-->
|
|
| 59 |
<!-- <value>classpath*:dnet-site-override.properties</value>-->
|
|
| 60 |
<!-- <value>classpath*:dnet-wizard.properties</value>-->
|
|
| 61 |
<!-- <value>classpath*:dnet-override.properties</value>-->
|
|
| 62 |
<!-- <value>classpath*:dnet-validator-wizard.properties</value>-->
|
|
| 63 |
<!-- <value>classpath*:dnet-validator-override.properties</value>-->
|
|
| 64 |
<!-- <value>classpath*:dnet-site-force-override.properties</value>-->
|
|
| 65 |
<!-- <value>classpath*:dnet-force-override.properties</value>-->
|
|
| 58 |
<value>classpath*:dnet-site-wizard.properties</value>
|
|
| 59 |
<value>classpath*:dnet-site-override.properties</value>
|
|
| 60 |
<value>classpath*:dnet-wizard.properties</value>
|
|
| 61 |
<value>classpath*:dnet-override.properties</value>
|
|
| 62 |
<value>classpath*:dnet-validator-wizard.properties</value>
|
|
| 63 |
<value>classpath*:dnet-validator-override.properties</value>
|
|
| 64 |
<value>classpath*:dnet-site-force-override.properties</value>
|
|
| 65 |
<value>classpath*:dnet-force-override.properties</value>
|
|
| 66 | 66 |
</list> |
| 67 | 67 |
</property> |
| 68 | 68 |
</bean> |
Also available in: Unified diff
fixed the piwik id identity