@eui/cli 15.0.0-next.3 → 15.0.0-next.4

package/lib/skeletons/full-stack/myapp-service/pom.xml

@@ -1,122 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-                             
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-      <groupId>@app.group.id@.@app.name@</groupId>
-      <version>0.0.1-SNAPSHOT</version>        
-      <artifactId>@app.name@</artifactId>
-    </parent>
-    <artifactId>@app.name@-service</artifactId>
-    <packaging>jar</packaging>
-
-    <name>@app.name.display@ service module</name>
-
-
-  <dependencies>
-
-
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-beans</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-expression</artifactId>
-      </dependency>
-
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-aop</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-core</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-jdbc</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-tx</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context-support</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-      </dependency>
-
-      <dependency>
-          <groupId>org.springframework.security</groupId>
-          <artifactId>spring-security-core</artifactId>
-      </dependency>
-
-
-      <dependency>
-          <groupId>org.mapstruct</groupId>
-          <artifactId>mapstruct</artifactId>
-      </dependency>
-
-
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>@app.name@-common</artifactId>
-        <version>${project.version}</version>        
-      </dependency>
-
-
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>@app.name@-persistence</artifactId>
-        <version>${project.version}</version>        
-      </dependency>
-
-
-  </dependencies>
-
-
-
-    <build>
-
-        <plugins>
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <version>2.2.4</version>
-                <configuration>
-                    <defaultOutputDirectory>
-                        ${project.build.directory}/generated-sources
-                    </defaultOutputDirectory>
-                    <processors>
-                        <processor>org.mapstruct.ap.MappingProcessor</processor>
-                    </processors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.mapstruct</groupId>
-                        <artifactId>mapstruct-processor</artifactId>
-                        <version>1.1.0.Beta2</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-
-    </build>
-
-
-</project>

package/lib/skeletons/full-stack/myapp-service/src/main/java/myapp/mapper/security/RightMapper.java

@@ -1,24 +0,0 @@
-package @app.group.id@.@app.name@.mapper.security;
-
-import @app.group.id@.@app.name@.common.dto.security.RightDTO;
-import @app.group.id@.@app.name@.entity.security.Right;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
-
-import java.util.List;
-
-@Mapper(componentModel = "spring", uses=RoleMapper.class)
-public interface RightMapper {
-    @Mappings(
-            @Mapping(target = "roles", ignore = true)
-    )
-    RightDTO toDTO(Right entity);
-
-    Right toEntity(RightDTO vo);
-
-    List<RightDTO> toDTOList(List<Right> list);
-
-    List<Right> toEntityList(List<RightDTO> list);
-}
-

package/lib/skeletons/full-stack/myapp-service/src/main/java/myapp/mapper/security/RoleMapper.java

@@ -1,19 +0,0 @@
-package @app.group.id@.@app.name@.mapper.security;
-
-import @app.group.id@.@app.name@.common.dto.security.RoleDTO;
-import @app.group.id@.@app.name@.entity.security.Role;
-import org.mapstruct.Mapper;
-
-import java.util.List;
-
-@Mapper(componentModel = "spring",uses=RightMapper.class)
-public interface RoleMapper {
-
-    RoleDTO toDTO(Role entity);
-
-    Role toEntity(RoleDTO vo);
-
-    List<RoleDTO> toDTOList(List<Role> list);
-
-    List<Role> toEntityList(List<RoleDTO> list);
-}

package/lib/skeletons/full-stack/myapp-service/src/main/java/myapp/mapper/security/UserMapper.java

@@ -1,19 +0,0 @@
-package @app.group.id@.@app.name@.mapper.security;
-
-import @app.group.id@.@app.name@.common.dto.security.UserDTO;
-import @app.group.id@.@app.name@.entity.security.User;
-import org.mapstruct.Mapper;
-
-import java.util.List;
-
-
-@Mapper(componentModel = "spring",uses=RoleMapper.class)
-public interface UserMapper {
-    UserDTO toDTO(User entity);
-
-    User toEntity(UserDTO vo);
-
-    List<UserDTO> toDTOList(List<User> list);
-
-    List<User> toEntityList(List<UserDTO> list);
-}

package/lib/skeletons/full-stack/myapp-service/src/main/java/myapp/service/security/SecurityService.java

@@ -1,242 +0,0 @@
-package @app.group.id@.@app.name@.service.security;
-
-import @app.group.id@.@app.name@.common.exception.AppException;
-import @app.group.id@.@app.name@.common.dto.security.RightDTO;
-import @app.group.id@.@app.name@.common.dto.security.RoleDTO;
-import @app.group.id@.@app.name@.common.dto.security.UserDTO;
-import @app.group.id@.@app.name@.entity.security.Right;
-import @app.group.id@.@app.name@.entity.security.Role;
-import @app.group.id@.@app.name@.entity.security.User;
-import @app.group.id@.@app.name@.mapper.security.RightMapper;
-import @app.group.id@.@app.name@.mapper.security.RoleMapper;
-import @app.group.id@.@app.name@.mapper.security.UserMapper;
-import @app.group.id@.@app.name@.repository.security.SecurityRightRepository;
-import @app.group.id@.@app.name@.repository.security.SecurityRoleRepository;
-import @app.group.id@.@app.name@.repository.security.SecurityUserRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class SecurityService {
-
-    private final static Logger logger = LoggerFactory.getLogger(SecurityService.class);
-
-    @Autowired
-    SecurityUserRepository securityUserRepository;
-
-    @Autowired
-    SecurityRoleRepository securityRoleRepository;
-
-    @Autowired
-    SecurityRightRepository securityRightRepository;
-
-    @Autowired
-    UserMapper userMapper;
-
-    @Autowired
-    RoleMapper roleMapper;
-
-    @Autowired
-    RightMapper rightMapper;
-
-
-
-
-    // -------------------------------------------------------
-    // GET RBAC roles entries for Spring Security mapped roles
-    // -------------------------------------------------------
-
-    public List<String> getSecurityUserRoles(String userId) {
-        List<String> roles = new ArrayList<>();
-
-        try {
-            User user = securityUserRepository.findByUserId(userId);
-
-            if (user.getRoles() != null) {
-                for (Role role : user.getRoles()) {
-                    if (role.getRights() != null) {
-                        for (Right right: role.getRights()) {
-                            roles.add("ROLE_RIGHT_" + right.getName());
-                        }
-                    }
-                }
-            } else {
-                roles.add("ROLE_RIGHT_right.default");
-            }
-
-        } catch(Exception e) {
-            logger.info("USER : " + userId + " NOT FOUND IN USER TABLE, providing default role....");
-        } finally {
-            roles.add("ROLE_RIGHT_right.default");
-        }
-
-        return roles;
-    }
-
-
-
-
-
-    // ---------------------------------
-    // USERS methods
-    // ---------------------------------
-
-    @SuppressWarnings("unchecked")
-    public List<UserDTO> getUsers() {
-        return userMapper.toDTOList((List) securityUserRepository.findAll());
-    }
-
-    public UserDTO getUserById(Long perId) {
-        return userMapper.toDTO(securityUserRepository.findOne(perId));
-    }
-
-    @Transactional
-    public UserDTO saveUser(UserDTO dto) {
-        User user;
-
-        try {
-            user = securityUserRepository.save(userMapper.toEntity(dto));
-        } catch(Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppException(e.getMessage(),"app.database.exception", e);
-        }
-
-        return userMapper.toDTO(user);
-    }
-
-
-
-
-
-
-
-
-
-    // ---------------------------------
-    // ROLES methods
-    // ---------------------------------
-
-
-    @SuppressWarnings("unchecked")
-    public List<RoleDTO> getRoles() {
-        return roleMapper.toDTOList((List) securityRoleRepository.findAll());
-    }
-
-    public RoleDTO getRoleById(Long roleId) {
-        return roleMapper.toDTO(securityRoleRepository.findOne(roleId));
-    }
-
-    @Transactional
-    public RoleDTO saveRole(RoleDTO roleDTO) {
-        Role role;
-
-        try {
-            role = securityRoleRepository.save(roleMapper.toEntity(roleDTO));
-        } catch(Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppException(e.getMessage(),"app.database.exception", e);
-        }
-
-        return roleMapper.toDTO(role);
-    }
-
-    @Transactional
-    public void deleteRole(Long roleId) {
-
-        try {
-            securityRoleRepository.delete(roleId);
-        } catch(Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppException(e.getMessage(),"app.database.exception", e);
-        }
-
-    }
-
-
-
-
-
-    // ---------------------------------
-    // RIGHTS methods
-    // ---------------------------------
-
-
-    public RightDTO getRightById(Long rightId) {
-        return rightMapper.toDTO(securityRightRepository.findOne(rightId));
-    }
-
-
-    public List<RightDTO> getRights(boolean isLoadRoles) {
-        Iterable<Right> rights = securityRightRepository.findAll();
-        List<RightDTO> rightDTOs = new ArrayList<>();
-        RightDTO rightDTO;
-        Iterable<Role> roles;
-        List<RoleDTO> roleDTOs;
-
-        if (rights != null) {
-            for (Right r : rights) {
-                rightDTO = rightMapper.toDTO(r);
-                if (isLoadRoles) {
-                    roles = securityRoleRepository.findByRights_rightId(rightDTO.getRightId());
-                    roleDTOs = new ArrayList<>();
-                    for (Role role : roles) {
-                        roleDTOs.add(new RoleDTO(role.getName()));
-                    }
-                    rightDTO.setRoles(roleDTOs);
-                    rightDTOs.add(rightDTO);
-                } else {
-                    rightDTOs.add(rightDTO);
-                }
-            }
-        }
-
-        return rightDTOs;
-    }
-
-    @Transactional
-    public RightDTO saveRight(RightDTO rightDTO) {
-        Right right;
-
-        try {
-            right = securityRightRepository.save(rightMapper.toEntity(rightDTO));
-        } catch(Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppException(e.getMessage(),"app.database.exception", e);
-        }
-
-        return rightMapper.toDTO(right);
-
-    }
-
-    @Transactional
-    public void deleteRight(Long rightId) {
-
-        try {
-            securityRightRepository.delete(rightId);
-        } catch(Exception e) {
-            logger.error(e.getMessage(), e);
-            throw new AppException(e.getMessage(),"app.database.exception", e);
-        }
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

package/lib/skeletons/full-stack/myapp-service/src/main/java/myapp/service/security/UserDetailsServiceCustom.java

@@ -1,85 +0,0 @@
-package @app.group.id@.@app.name@.service.security;
-
-import java.security.Principal;
-import java.util.LinkedList;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-
-import eu.cec.digit.ecas.client.jaas.DetailedUser;
-import @app.group.id@.@app.name@.common.ecas.UserHolder;
-import @app.group.id@.@app.name@.common.security.UserContext;
-import @app.group.id@.@app.name@.common.dto.security.RoleDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessException;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserDetailsServiceCustom implements UserDetailsService {
-
-    private final static Logger logger = LoggerFactory.getLogger(UserDetailsServiceCustom.class);
-
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException, DataAccessException {
-
-        try {
-
-            DetailedUser detailedUser = UserHolder.getDetailedUser();
-            Long perId = UserHolder.extractEcasEmployeeNumber(detailedUser);
-
-            UserContext userContext = new UserContext(username);
-            userContext.setEmail(detailedUser.getEmail());
-            userContext.setDomain(detailedUser.getDomain());
-            userContext.setPerId(perId);
-            userContext.setDetailedUser(detailedUser);
-            userContext.setFirstName(detailedUser.getFirstName());
-            userContext.setLastName(detailedUser.getLastName());
-
-            userContext.setRoleList(new LinkedList<RoleDTO>());
-
-            if (existsClass("weblogic.security.Security")) {
-                Subject subject = (Subject) Class.forName("weblogic.security.Security").getMethod("getCurrentSubject", null).invoke(null, null);
-                Set<Principal> principals = subject.getPrincipals();
-                for (Principal principal : principals) {
-                    if (Class.forName("weblogic.security.spi.WLSGroup").isInstance(principal)) {
-                        RoleDTO role = new RoleDTO();
-                        role.setName(principal.getName());
-                        userContext.getRoleList().add(role);
-                        logger.info("---------------------------------------REGISTERED ROLE : " + principal.getName());
-                    }
-                }
-            }
-
-            UserHolder.setUser(userContext);
-
-            return userContext;
-
-        } catch (Exception ex) {
-            if (ex instanceof UsernameNotFoundException) {
-                throw (UsernameNotFoundException) ex;
-            } else
-                throw new UsernameNotFoundException("Cannot retrieve the userDetails", ex);
-        }
-    }
-
-    public boolean existsClass(String claszzName) {
-        boolean exists = true;
-        try {
-            Class.forName(claszzName, false, getClass().getClassLoader());
-        } catch (ClassNotFoundException e) {
-            exists = false;
-        }
-        return exists;
-    }
-
-
-    public UserDetails getUserContext() {
-        return UserHolder.getUser();
-    }
-
-
-}

package/lib/skeletons/full-stack/myapp-web/pom.xml

@@ -1,73 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-    <parent>
-      <groupId>@app.group.id@.@app.name@</groupId>
-      <version>0.0.1-SNAPSHOT</version>
-      <artifactId>@app.name@</artifactId>
-    </parent>
-
-  <artifactId>@app.name@-web</artifactId>
-  <packaging>war</packaging>
-  <name>@app.name.display@ web module</name>
-
-  <dependencies>
-      <dependency>
-          <groupId>eu.europa.ec.digit.uxatec.eui</groupId>
-          <artifactId>eui-angular2-servlet</artifactId>
-          <version>1.0.0</version>
-      </dependency>
-
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>@app.name@-web-rest</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-  </dependencies>
-
-
-  <build>
-    <finalName>@app.name.display@</finalName>
-    <plugins>
-        <plugin>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-codegen-maven-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-                <execution>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>generate</goal>
-                    </goals>
-                    <configuration>
-                        <inputSpec>${basedir}/../@app.name@-web-rest/target/generated-sources/swagger/swagger.json</inputSpec>
-                        <language>@app.group.id@.@app.name@.codegen.TypescriptClientCodegen</language>
-                        <output>${basedir}/src/main/angular/src/app/shared/swagger</output>
-                    </configuration>
-                </execution>
-            </executions>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>@app.name@-web-rest-swagger</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>3.0.0</version>
-            <configuration>
-                <failOnMissingWebXml>false</failOnMissingWebXml>
-                <webResources>
-                    <resource>
-                        <directory>src/main/angular/dist</directory>
-                    </resource>
-                </webResources>
-            </configuration>
-        </plugin>
-    </plugins>
-  </build>
-</project>

package/lib/skeletons/full-stack/myapp-web/src/main/resources/datasourceContext-hsql-db.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:jee="http://www.springframework.org/schema/jee"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-       xmlns="http://www.springframework.org/schema/beans"
-       xmlns:jpa="http://www.springframework.org/schema/data/jpa"       
-       xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd
-                           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		                       http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.1.xsd
-		                       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-                           http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd                           
-		                       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-    <context:annotation-config/>
-    <context:load-time-weaver/>
-    <tx:annotation-driven/>
-    
-	<jdbc:embedded-database id="dataSource" type="HSQL">
-		<jdbc:script location="classpath:/hsql-db-init.sql"/>
-	</jdbc:embedded-database>
-	
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="packagesToScan" value="@app.group.id@.@app.name@.entity"/>
-		<property name="dataSource" ref="dataSource"/>
-		<property name="jpaProperties">
-			<props>
-				 <prop key="eclipselink.ddl-generation">create-or-extend-tables</prop>
-				 <prop key="eclipselink.ddl-generation.output-mode">database</prop>
-				 <prop key="eclipselink.logging.level">FINE</prop>
-				 <prop key="eclipselink.weaving">false</prop>
-			</props>
-		</property>
-		<property name="persistenceProvider">
-			<bean class="org.eclipse.persistence.jpa.PersistenceProvider"/>
-		</property>
-	</bean>
-	
-	<tx:annotation-driven transaction-manager="transactionManager"/>
-
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="dataSource" ref="dataSource"/>
-	</bean>
-
-	<jpa:repositories base-package="@app.group.id@.@app.name@.repository"/>
-
-
-</beans>

package/lib/skeletons/full-stack/myapp-web/src/main/resources/datasourceContext-hsql.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:jee="http://www.springframework.org/schema/jee"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-       xmlns="http://www.springframework.org/schema/beans"
-       xmlns:jpa="http://www.springframework.org/schema/data/jpa"       
-       xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.1.xsd
-                           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		                       http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.1.xsd
-		                       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-                           http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd                           
-		                       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
-
-    <context:annotation-config/>
-    <context:load-time-weaver/>
-    <tx:annotation-driven/>
-
-    <tx:annotation-driven/>
-
-	<jdbc:embedded-database id="dataSource" type="HSQL"/>
-	
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="packagesToScan" value="@app.group.id@.@app.name@.entity"/>
-		<property name="dataSource" ref="dataSource"/>
-		<property name="jpaProperties">
-			<props>
-				 <prop key="eclipselink.ddl-generation">drop-and-create-tables</prop>
-				 <prop key="eclipselink.ddl-generation.output-mode">database</prop>
-				 <prop key="eclipselink.logging.level">FINE</prop>
-				 <prop key="eclipselink.weaving">false</prop>
-			</props>
-		</property>
-		<property name="persistenceProvider">
-			<bean class="org.eclipse.persistence.jpa.PersistenceProvider"/>
-		</property>
-	</bean>
-	
-	<tx:annotation-driven transaction-manager="transactionManager"/>
-
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="dataSource" ref="dataSource"/>
-	</bean>
-
-	<jpa:repositories base-package="@app.group.id@.@app.name@.repository"/>    
-
-
-  
-</beans>