Subversion Repositories Study

Compare Revisions

Ignore whitespace Rev 361 → Rev 362

/trunk/maven/maven-multi/jouvinio-dao/pom.xml
1,6 → 1,7
<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>fr.ejn.tutorial.maven</groupId>
<artifactId>jouvinio-multi</artifactId>
7,13 → 8,24
<relativePath>../jouvinio-multi/pom.xml</relativePath>
<version>1.2</version>
</parent>
 
<artifactId>jouvinio-dao</artifactId>
<name>DAO module</name>
<description>DAO definition in multi modules</description>
<packaging>jar</packaging>
 
<properties>
<parentBasedir>../</parentBasedir>
</properties>
 
<dependencies>
<dependency>
<artifactId>jouvinio-datas</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
</dependencies>
 
<build>
<plugins>
<plugin>
22,11 → 34,5
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<artifactId>jouvinio-datas</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
</dependencies>
 
</project>
/trunk/maven/maven-multi/jouvinio-daoImpl/pom.xml
1,6 → 1,7
<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>fr.ejn.tutorial.maven</groupId>
<artifactId>jouvinio-multi</artifactId>
7,21 → 8,16
<relativePath>../jouvinio-multi/pom.xml</relativePath>
<version>1.2</version>
</parent>
 
<artifactId>jouvinio-daoImpl</artifactId>
<name>DAO impl module</name>
<description>DAO implementation in multi modules</description>
<packaging>jar</packaging>
 
<properties>
<parentBasedir>../</parentBasedir>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
</plugin>
</plugins>
</build>
 
<dependencies>
<dependency>
<artifactId>commons-collections4</artifactId>
38,4 → 34,14
<version>${project.version}</version>
</dependency>
</dependencies>
 
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
</plugin>
</plugins>
</build>
 
</project>
/trunk/maven/maven-multi/jouvinio-datas/pom.xml
1,6 → 1,7
<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>fr.ejn.tutorial.maven</groupId>
<artifactId>jouvinio-multi</artifactId>
7,13 → 8,19
<relativePath>../jouvinio-multi/pom.xml</relativePath>
<version>1.2</version>
</parent>
 
<artifactId>jouvinio-datas</artifactId>
<name>Datas module</name>
<description>Datas model in multi modules</description>
<packaging>jar</packaging>
 
<properties>
<parentBasedir>../</parentBasedir>
</properties>
 
<dependencies>
</dependencies>
 
<build>
<plugins>
<plugin>
22,6 → 29,5
</plugin>
</plugins>
</build>
<dependencies>
</dependencies>
 
</project>
/trunk/maven/maven-multi/jouvinio-multi/pom.xml
1,12 → 1,36
<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>
 
<groupId>fr.ejn.tutorial.maven</groupId>
<artifactId>jouvinio-multi</artifactId>
<version>1.2</version>
<packaging>pom</packaging>
<name>Multi modules Maven</name>
<description>Example for Maven multi module</description>
<packaging>pom</packaging>
 
<modules>
<module>../jouvinio-dao</module>
<module>../jouvinio-daoImpl</module>
<module>../jouvinio-datas</module>
<module>../jouvinio-service</module>
</modules>
 
<scm>
<connection>scm:svn:http://www.svn.jouvinio.net/study/trunk/maven/maven-multi/</connection>
<developerConnection>scm:svn:https://www.svn.jouvinio.net/study/trunk/maven/maven-multi/</developerConnection>
<url>http://www.svn.jouvinio.net/study/trunk/maven/maven-multi/</url>
</scm>
 
<properties>
<commons-collections4.version>4.1</commons-collections4.version>
<commons.lang.version>3.7</commons.lang.version>
<junit.version>4.12</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
 
<dependencyManagement>
<dependencies>
<dependency>
21,14 → 45,7
</dependency>
</dependencies>
</dependencyManagement>
<properties>
<commons-collections4.version>4.1</commons-collections4.version>
<commons.lang.version>3.7</commons.lang.version>
<junit.version>4.12</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
 
<dependencies>
<dependency>
<artifactId>junit</artifactId>
37,6 → 54,7
<version>${junit.version}</version>
</dependency>
</dependencies>
 
<build>
<pluginManagement>
<plugins>
43,7 → 61,7
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.8.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
54,10 → 72,5
<plugins>
</plugins>
</build>
<modules>
<module>../jouvinio-dao</module>
<module>../jouvinio-daoImpl</module>
<module>../jouvinio-datas</module>
<module>../jouvinio-service</module>
</modules>
 
</project>
/trunk/maven/maven-multi/jouvinio-service/pom.xml
1,6 → 1,7
<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>fr.ejn.tutorial.maven</groupId>
<artifactId>jouvinio-multi</artifactId>
7,21 → 8,16
<relativePath>../jouvinio-multi/pom.xml</relativePath>
<version>1.2</version>
</parent>
 
<artifactId>jouvinio-service</artifactId>
<name>Service module</name>
<description>Service implementation in muti modules</description>
<packaging>jar</packaging>
 
<properties>
<parentBasedir>../</parentBasedir>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
 
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
44,4 → 40,14
<version>${project.version}</version>
</dependency>
</dependencies>
 
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
</plugins>
</build>
 
</project>
/trunk/maven/maven-multi/jouvinio-service/src/main/java/fr/ejn/tutorial/multi/impl/service/UserServiceImpl.java
9,7 → 9,7
 
/**
* @author Etienne Jouvin
*
*
*/
public class UserServiceImpl {
 
18,7 → 18,7
 
/**
* Search the user and say hello.
*
*
* @param userId Id to search.
*/
public String sayHello(String userId) {
35,11 → 35,7
message = MessageFormat.format(MSG_HELLO, user.getName(), user.getSurname());
}
 
if (StringUtils.isBlank(message)) {
message = StringUtils.EMPTY;
}
 
return message;
return StringUtils.defaultIfBlank(message, StringUtils.EMPTY);
}
 
/**