Merge remote-tracking branch 'upstream/master'

pom.xml

@@ -21,6 +21,8 @@
 		<project.reporting.outputEncoding>UTF-8
 		</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
 		<start-class>org.ow2.clif.console.lib.webui.ClifWebuiApplication
 		</start-class>
@@ -200,39 +202,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.2</version>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.ow2.clif.isac</groupId>
-									<artifactId>isac-commons</artifactId>
-									<version>3.0.3</version>
-									<type>zip</type>
-									<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib
-									</outputDirectory>
-									<includes>Chrono-*.jar,Context-*.jar,Common-*.jar,Counter-*.jar,CsvProvider-*.jar,FileReader-*.jar,IpProvider-*.jar,Random-*.jar,StringHandler-*.jar,Synchro-*.jar
-									</includes>
-								</artifactItem>
-							</artifactItems>
-							<includes>*.jar</includes>
-							<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib
-							</outputDirectory>
-							<overWriteReleases>true</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>

src/main/java/org/ow2/clif/console/lib/webui/storage/FileSystemStorage.java

@@ -329,8 +329,15 @@ public class FileSystemStorage {
 	}
 
 	public List<String> loadProjects() throws IOException {
-		List<Path> listPath = (Files.walk(this.rootLocation, 1).filter(path -> !path.equals(this.rootLocation))
-				.map(this.rootLocation::relativize)).collect(Collectors.toList());
+		logger.debug("List projects: ");
+		List<Path> listPath =
+			(Files.walk(this.rootLocation, 1)
+				.filter(path -> !path.equals(this.rootLocation))
+				.filter(path -> path.toFile().isDirectory())
+				.sorted()
+				.map(this.rootLocation::relativize)
+			).collect(Collectors.toList());
+		logger.debug(Arrays.toString(listPath.toArray()));
 		List<String> listString = new ArrayList<>();
 		for (int i = 0; i < listPath.size(); i++) {
 			listString.add(listPath.get(i).toString());

src/main/java/org/ow2/clif/console/lib/webui/storage/StorageProperties.java

@@ -33,7 +33,7 @@ public class StorageProperties {
 	private String clifWorkspace;
 	
 	public String getLocation() {
-		clifWorkspace=clifWorkspace.replace("%PROJECTROOT%",System.getProperty("user.dir"));
+		clifWorkspace=clifWorkspace.replace("%PROJECTROOT%",System.getProperty("user.home"));
 		return clifWorkspace;
 	}