Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

423060 Allow ${jetty.base}/work

This commit is contained in:
Jan Bartel 2013-12-12 18:06:43 +11:00
parent a12ad15a2c
commit 4d2c6ca21a
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
View File

@ -283,12 +283,25 @@ public class WebInfConfiguration extends AbstractConfiguration
{ {
//Make a temp directory as a child of the given base dir //Make a temp directory as a child of the given base dir
makeTempDirectory(baseTemp,context); makeTempDirectory(baseTemp,context);
return;
} }
else
//Look for a directory named "work" in ${jetty.base} and
//treat it as parent of a new temp dir (which we will persist)
File jettyBase = asFile(System.getProperty("jetty.base"));
if (jettyBase != null)
{ {
//Make a temp directory in java.io.tmpdir File work = new File (jettyBase, "work");
makeTempDirectory(new File(System.getProperty("java.io.tmpdir")),context); if (work.exists() && work.isDirectory() && work.canWrite())
{
context.setPersistTempDirectory(true);
makeTempDirectory(work,context);
return;
}
} }
//Make a temp directory in java.io.tmpdir
makeTempDirectory(new File(System.getProperty("java.io.tmpdir")),context);
} }
/** /**
@ -322,12 +335,24 @@ public class WebInfConfiguration extends AbstractConfiguration
if (parent == null || !parent.exists() || !parent.canWrite() || !parent.isDirectory()) if (parent == null || !parent.exists() || !parent.canWrite() || !parent.isDirectory())
throw new IllegalStateException("Parent for temp dir not configured correctly: "+(parent==null?"null":"writeable="+parent.canWrite())); throw new IllegalStateException("Parent for temp dir not configured correctly: "+(parent==null?"null":"writeable="+parent.canWrite()));
//Create a name for the webapp
String temp = getCanonicalNameForWebAppTmpDir(context); String temp = getCanonicalNameForWebAppTmpDir(context);
File tmpDir = File.createTempFile(temp, ".dir", parent); File tmpDir = null;
//delete the file that was created if (context.isPersistTempDirectory())
tmpDir.delete(); {
//and make a directory of the same name //if it is to be persisted, make sure it will be the same name
tmpDir.mkdirs(); //by not using File.createTempFile, which appends random digits
tmpDir = new File (parent, temp);
}
else
{
//ensure file will always be unique by appending random digits
tmpDir = File.createTempFile(temp, ".dir", parent);
//delete the file that was created
tmpDir.delete();
//and make a directory of the same name
tmpDir.mkdirs();
}
configureTempDirectory(tmpDir, context); configureTempDirectory(tmpDir, context);
if(LOG.isDebugEnabled()) if(LOG.isDebugEnabled())