CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

Ignoring hasMifosPlatformStarted test case and shorter file name for Windows

Browse Source
This commit is contained in:
Vishwas Babu A J
2014-09-26 01:42:46 -07:00
parent 68f6ecc60d
commit 276e6b1864
3 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/boot/EmbeddedTomcatWithSSLConfiguration.java
+37 -34
View File
@@ -57,12 +57,12 @@ public class EmbeddedTomcatWithSSLConfiguration {
}
}
protected int getHTTPSPort() {
// TODO This shouldn't be hard-coded here, but configurable
return 8443;
}
protected int getHTTPSPort() {
// TODO This shouldn't be hard-coded here, but configurable
return 8443;
}
protected String getKeystorePass() {
protected String getKeystorePass() {
return "openmf";
}
@@ -70,35 +70,38 @@ public class EmbeddedTomcatWithSSLConfiguration {
return new ClassPathResource("/keystore.jks");
}
public File getFile(Resource resource) throws IOException {
try {
return resource.getFile();
} catch (IOException e) {
// Uops.. OK, try again (below)
}
public File getFile(Resource resource) throws IOException {
try {
return resource.getFile();
} catch (IOException e) {
// Uops.. OK, try again (below)
}
try {
URL url = resource.getURL();
// If this creates filenames that are too long on Win,
// then could just use resource.getFilename(),
// even though not unique, real risk prob. min.bon
String tempDir = System.getProperty("java.io.tmpdir");
tempDir = tempDir + "/" + getClass().getSimpleName() + "/";
String path = url.getPath();
String uniqName = path.replace("file:/", "").replace('!', '_');
String tempFullPath = tempDir + uniqName;
// instead of File.createTempFile(prefix?, suffix?);
File targetFile = new File(tempFullPath);
long len = resource.contentLength();
if (!targetFile.exists() || targetFile.length() != len) { // Only copy new files
FileUtils.copyURLToFile(url, targetFile);
}
return targetFile;
} catch (IOException e) {
// Uops.. erm, give up:
throw new IOException("Cannot obtain a File for Resource: "
+ resource.toString(), e);
}
try {
URL url = resource.getURL();
/**
* // If this creates filenames that are too long on Win, // then
* could just use resource.getFilename(), // even though not unique,
* real risk prob. min.bon String tempDir =
* System.getProperty("java.io.tmpdir"); tempDir = tempDir + "/" +
* getClass().getSimpleName() + "/"; String path = url.getPath();
* String uniqName = path.replace("file:/", "").replace('!', '_');
* String tempFullPath = tempDir + uniqName;
**/
// instead of File.createTempFile(prefix?, suffix?);
File targetFile = new File(resource.getFilename());
long len = resource.contentLength();
if (!targetFile.exists() || targetFile.length() != len) { // Only
// copy
// new
// files
FileUtils.copyURLToFile(url, targetFile);
}
return targetFile;
} catch (IOException e) {
// Uops.. erm, give up:
throw new IOException("Cannot obtain a File for Resource: " + resource.toString(), e);
}
}
}
}