merge with branch issue-464

This commit is contained in:
Sebastian Sdorra
2013-10-30 08:33:35 +01:00
3 changed files with 21 additions and 0 deletions

View File

@@ -0,0 +1,5 @@
This directory is the temp directory for the SCM-Manager webapp.
Further reading on jetty temp directories:
- http://wiki.eclipse.org/Jetty/Reference/Temporary_Directories

View File

@@ -92,6 +92,16 @@
<destName>logging.xml</destName>
</file>
<!--
create work directory, see
https://bitbucket.org/sdorra/scm-manager/issue/464/scmserver-login-page-fails-to-render
-->
<file>
<source>src/main/assembly/WORKDIR.txt</source>
<outputDirectory>work</outputDirectory>
</file>
</files>
</assembly>

View File

@@ -69,6 +69,9 @@
<Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>
<Arg>false</Arg>
</Call>
<Set name="tempDirectory">
<SystemProperty name="basedir" default="."/>/work
</Set>
</New>
<New id="docroot" class="org.eclipse.jetty.webapp.WebAppContext">
@@ -82,6 +85,9 @@
</Arg>
</New>
</Set>
<Set name="tempDirectory">
<SystemProperty name="basedir" default="."/>/work
</Set>
</New>
<Set name="handler">