Skip to content
Snippets Groups Projects
Commit d55d1fb3 authored by srosse's avatar srosse
Browse files

OO-861: upgrade requirement to JDK 1.7, add some 1.7 specific code and check...

OO-861: upgrade requirement to JDK 1.7, add some 1.7 specific code and check if all our build chain works
parent a5f9ff04
No related branches found
No related tags found
No related merge requests found
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
level if necessary. --> level if necessary. -->
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.6</targetJdk> <targetJdk>1.7</targetJdk>
<org.springframework.version>3.2.4.RELEASE</org.springframework.version> <org.springframework.version>3.2.4.RELEASE</org.springframework.version>
<org.hibernate.version>4.2.6.Final</org.hibernate.version> <org.hibernate.version>4.2.6.Final</org.hibernate.version>
<com.sun.jersey.version>1.17.1</com.sun.jersey.version> <com.sun.jersey.version>1.17.1</com.sun.jersey.version>
...@@ -1220,14 +1220,14 @@ ...@@ -1220,14 +1220,14 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!-- OLAT requires JDK 1.6 or later ! --> <!-- OLAT requires JDK 1.7 or later ! -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version> <version>2.5.1</version>
<configuration> <configuration>
<source>1.6</source> <source>1.7</source>
<target>1.6</target> <target>1.7</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
...@@ -1318,7 +1318,7 @@ ...@@ -1318,7 +1318,7 @@
<version>2.2+</version> <version>2.2+</version>
</requireMavenVersion> </requireMavenVersion>
<requireJavaVersion> <requireJavaVersion>
<version>1.6+</version> <version>1.7+</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
......
...@@ -22,6 +22,7 @@ package org.olat.core.util.vfs.version; ...@@ -22,6 +22,7 @@ package org.olat.core.util.vfs.version;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
...@@ -761,6 +762,11 @@ public class VersionsFileManager extends VersionsManager implements Initializabl ...@@ -761,6 +762,11 @@ public class VersionsFileManager extends VersionsManager implements Initializabl
if (absolutPath.startsWith(getCanonicalRoot())) { if (absolutPath.startsWith(getCanonicalRoot())) {
relPath = absolutPath.substring(getCanonicalRoot().length()); relPath = absolutPath.substring(getCanonicalRoot().length());
} }
Path path = impl.getBasefile().toPath();
Path relativePath = getCanonicalRootFile().toPath().relativize(path);
String relPath2 = "/" + relativePath.toString();
log.debug(relPath + " :: " + relPath2);
} }
return relPath; return relPath;
} }
...@@ -797,11 +803,15 @@ public class VersionsFileManager extends VersionsManager implements Initializabl ...@@ -797,11 +803,15 @@ public class VersionsFileManager extends VersionsManager implements Initializabl
return null; return null;
} }
public String getCanonicalRoot() { public File getCanonicalRootFile() {
if(rootFolder == null) { if(rootFolder == null) {
rootFolder = new File(FolderConfig.getCanonicalRoot()); rootFolder = new File(FolderConfig.getCanonicalRoot());
} }
return rootFolder.getAbsolutePath(); return rootFolder;
}
public String getCanonicalRoot() {
return getCanonicalRootFile().getAbsolutePath();
} }
public File getRootVersionsFile() { public File getRootVersionsFile() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment