Project

General

Profile

« Previous | Next » 

Revision 61631

Added by Konstantina Galouni over 2 years ago

[Trunk | Monitor Service]:
1. StakeholderController.java: In method "getAllRealStakeholders()" (/stakeholder), return also stakeholders with "restricted" visibility, without checking user's roles.
2. pom.xml:
a. Update parent from "spring-boot-starter-parent" to "dnet45-parent" ==> add <dependencyManagement> and "maven-war-plugin" and comment "spring-boot-maven-plugin".
b. For dependencies "uoa-authorization-library" and "uoa-notification-service", use version 1.0.0 (released version), not 1.0.0-SNAPSHOT.

View differences:

modules/uoa-monitor-service/trunk/src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java
378 378 
                if(rolesUtils.isCurator(roles, stakeholder.getType())
379 379 
                        || rolesUtils.isManager(roles, stakeholder.getType(), stakeholder.getAlias())
380 380 
                        || stakeholder.getVisibility() == Visibility.PUBLIC
381 
                        || (stakeholder.getVisibility() == Visibility.RESTRICTED && rolesUtils.isMember(roles, stakeholder.getType(), stakeholder.getAlias()))) {
381 
                        || stakeholder.getVisibility() == Visibility.RESTRICTED) {
382 
//                        || (stakeholder.getVisibility() == Visibility.RESTRICTED && rolesUtils.isMember(roles, stakeholder.getType(), stakeholder.getAlias()))) {
382 383 
                    //stakeholdersFull.add(this.setFullEntities(stakeholder));
383 384 
                    continue;
384 385 
                }
modules/uoa-monitor-service/trunk/pom.xml
11 11 

  		




  12
  12
  
    
    <name>uoa-monitor-service</name>


  		




  13
  13
  
    

  		




  
  14
  
    
<!-- Use parent with artifact spring-boot-starter-parent and add plugin with artifact spring-boot-maven-plugin in order to run springboot run command-->


  		




  
  15
  
    
<!--    <parent>-->


  		




  
  16
  
    
<!--        <groupId>org.springframework.boot</groupId>-->


  		




  
  17
  
    
<!--        <artifactId>spring-boot-starter-parent</artifactId>-->


  		




  
  18
  
    
<!--        <version>1.5.8.RELEASE</version>-->


  		




  
  19
  
    
<!--        <relativePath/> &lt;!&ndash; lookup parent from repository &ndash;&gt;-->


  		




  
  20
  
    
<!--    </parent>-->


  		




  
  21
  
    

  		




  
  22
  
    
    <!-- Comment parent with artifact dnet45-parent and <dependencyManagement> in order to run springboot run command -->


  		




  14
  23
  
    
    <parent>


  		




  15
  
  
    
        <groupId>org.springframework.boot</groupId>


  		




  16
  
  
    
        <artifactId>spring-boot-starter-parent</artifactId>


  		




  17
  
  
    
        <version>1.5.8.RELEASE</version>


  		




  18
  
  
    
        <relativePath/> <!-- lookup parent from repository -->


  		




  
  24
  
    
        <groupId>eu.dnetlib</groupId>


  		




  
  25
  
    
        <artifactId>dnet45-parent</artifactId>


  		




  
  26
  
    
        <version>1.0.0</version>


  		




  19
  27
  
    
    </parent>


  		




  20
  28
  
    

  		




  21
  
  
    
<!--    <parent>-->


  		




  22
  
  
    
<!--        <groupId>eu.dnetlib</groupId>-->


  		




  23
  
  
    
<!--        <artifactId>dnet45-parent</artifactId>-->


  		




  24
  
  
    
<!--        <version>1.0.0-SNAPSHOT</version>-->


  		




  25
  
  
    
<!--    </parent>-->


  		




  26
  
  
    

  		




  27
  29
  
    
    <properties>


  		




  28
  30
  
    
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


  		




  29
  31
  
    
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>


  		




  ......




  32
  34
  
    
        <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>


  		




  33
  35
  
    
    </properties>


  		




  34
  36
  
    

  		




  
  37
  
    
    <!-- Comment parent with artifact dnet45-parent and <dependencyManagement> in order to run springboot run command -->


  		




  
  38
  
    
    <dependencyManagement>


  		




  
  39
  
    
        <dependencies>


  		




  
  40
  
    
            <dependency>


  		




  
  41
  
    
                <groupId>org.springframework.boot</groupId>


  		




  
  42
  
    
                <artifactId>spring-boot-dependencies</artifactId>


  		




  
  43
  
    
                <version>1.5.8.RELEASE</version>


  		




  
  44
  
    
                <type>pom</type>


  		




  
  45
  
    
                <scope>import</scope>


  		




  
  46
  
    
            </dependency>


  		




  
  47
  
    
        </dependencies>


  		




  
  48
  
    
    </dependencyManagement>


  		




  35
  49
  
    
    <dependencies>


  		




  36
  50
  
    
        <dependency>


  		




  37
  51
  
    
            <groupId>org.springframework.boot</groupId>


  		




  ......




  77
  91
  
    
        <dependency>


  		




  78
  92
  
    
            <groupId>eu.dnetlib</groupId>


  		




  79
  93
  
    
            <artifactId>uoa-authorization-library</artifactId>


  		




  80
  
  
    
            <version>1.0.0-SNAPSHOT</version>


  		




  
  94
  
    
            <version>1.0.0</version>


  		




  81
  95
  
    
        </dependency>


  		




  82
  96
  
    
        <dependency>


  		




  83
  97
  
    
            <groupId>eu.dnetlib</groupId>


  		




  84
  98
  
    
            <artifactId>uoa-notification-service</artifactId>


  		




  85
  
  
    
            <version>1.0.0-SNAPSHOT</version>


  		




  
  99
  
    
            <version>1.0.0</version>


  		




  86
  100
  
    
        </dependency>


  		




  87
  101
  
    
        <dependency>


  		




  88
  102
  
    
            <groupId>org.springframework.boot</groupId>


  		




  ......




  97
  111
  
    

  		




  98
  112
  
    
    <build>


  		




  99
  113
  
    
        <plugins>


  		




  100
  
  
    
            <plugin>


  		




  101
  
  
    
                <groupId>org.springframework.boot</groupId>


  		




  102
  
  
    
                <artifactId>spring-boot-maven-plugin</artifactId>


  		




  103
  
  
    
            </plugin>


  		




  
  114
  
    
<!-- Use parent with artifact spring-boot-starter-parent and add plugin with artifact spring-boot-maven-plugin in order to run springboot run command-->


  		




  
  115
  
    
<!--            <plugin>-->


  		




  
  116
  
    
<!--                <groupId>org.springframework.boot</groupId>-->


  		




  
  117
  
    
<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->


  		




  
  118
  
    
<!--            </plugin>-->


  		




  
  119
  
    

  		




  104
  120
  
    
            <!--3d answer: https://stackoverflow.com/questions/23260057/the-forked-vm-terminated-without-saying-properly-goodbye-vm-crash-or-system-exi-->


  		




  105
  121
  
    
            <!--If you use openjdk there might be a problem with surfire plugin - uncomment following lines-->


  		




  106
  122
  
    
            <plugin>


  		




  ......




  112
  128
  
    
                    <useSystemClassLoader>false</useSystemClassLoader>


  		




  113
  129
  
    
                </configuration>


  		




  114
  130
  
    
            </plugin>


  		




  
  131
  
    

  		




  
  132
  
    
            <plugin>


  		




  
  133
  
    
                <groupId>org.apache.maven.plugins</groupId>


  		




  
  134
  
    
                <artifactId>maven-war-plugin</artifactId>


  		




  
  135
  
    
                <version>2.6</version>


  		




  
  136
  
    
                <configuration>


  		




  
  137
  
    
                    <failOnMissingWebXml>false</failOnMissingWebXml>


  		




  
  138
  
    
                </configuration>


  		




  
  139
  
    
            </plugin>


  		




  
  140
  
    

  		




  115
  141
  
    
        </plugins>


  		




  116
  142
  
    
        <finalName>uoa-monitor-service</finalName>


  		




  117
  143
  
    
        <resources>


  		












Also available in:  Unified diff