Commit 631f6963 authored by Antoine Thevenet's avatar Antoine Thevenet
Browse files

Merge remote-tracking branch 'upstream/master'

parents 278cea8f 1630e4bf
Pipeline #14385 failed with stages
in 20 seconds
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
<project.reporting.outputEncoding>UTF-8 <project.reporting.outputEncoding>UTF-8
</project.reporting.outputEncoding> </project.reporting.outputEncoding>
<java.version>1.8</java.version> <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> <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
<start-class>org.ow2.clif.console.lib.webui.ClifWebuiApplication <start-class>org.ow2.clif.console.lib.webui.ClifWebuiApplication
</start-class> </start-class>
...@@ -200,39 +202,6 @@ ...@@ -200,39 +202,6 @@
<build> <build>
<plugins> <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> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
......
...@@ -329,8 +329,15 @@ public class FileSystemStorage { ...@@ -329,8 +329,15 @@ public class FileSystemStorage {
} }
public List<String> loadProjects() throws IOException { public List<String> loadProjects() throws IOException {
List<Path> listPath = (Files.walk(this.rootLocation, 1).filter(path -> !path.equals(this.rootLocation)) logger.debug("List projects: ");
.map(this.rootLocation::relativize)).collect(Collectors.toList()); 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<>(); List<String> listString = new ArrayList<>();
for (int i = 0; i < listPath.size(); i++) { for (int i = 0; i < listPath.size(); i++) {
listString.add(listPath.get(i).toString()); listString.add(listPath.get(i).toString());
......
...@@ -33,7 +33,7 @@ public class StorageProperties { ...@@ -33,7 +33,7 @@ public class StorageProperties {
private String clifWorkspace; private String clifWorkspace;
public String getLocation() { public String getLocation() {
clifWorkspace=clifWorkspace.replace("%PROJECTROOT%",System.getProperty("user.dir")); clifWorkspace=clifWorkspace.replace("%PROJECTROOT%",System.getProperty("user.home"));
return clifWorkspace; return clifWorkspace;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment