fixes wrong cache directory location on windows

This commit is contained in:
Sebastian Sdorra
2020-07-06 08:10:08 +02:00
parent 4279573633
commit 0dadc8d63c
4 changed files with 14 additions and 5 deletions

View File

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
# Unreleased
### Fixed
- Fixed wrong cache directory location ([#1236](https://github.com/scm-manager/scm-manager/issues/1236) and [#1242](https://github.com/scm-manager/scm-manager/issues/1242))
## [2.2.0] - 2020-07-03
### Added

View File

@@ -63,7 +63,7 @@
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>var/webapp</outputDirectory>
<outputDirectory>webapp</outputDirectory>
<outputFileNameMapping>scm-webapp.war</outputFileNameMapping>
<includes>
<include>*:war</include>

View File

@@ -70,14 +70,16 @@
<New id="scm-webapp" class="org.eclipse.jetty.webapp.WebAppContext">
<Set name="contextPath">/scm</Set>
<Set name="war">
<SystemProperty name="basedir" default="."/>/var/webapp/scm-webapp.war
<SystemProperty name="basedir" default="."/>/webapp/scm-webapp.war
</Set>
<!-- disable directory listings -->
<Call name="setInitParameter">
<Arg>org.eclipse.jetty.servlet.Default.dirAllowed</Arg>
<Arg>false</Arg>
</Call>
<Set name="tempDirectory">/var/cache/scm/work/webapp</Set>
<Set name="tempDirectory">
<SystemProperty name="basedir" default="."/>/work/scm-webapp
</Set>
</New>
<New id="docroot" class="org.eclipse.jetty.webapp.WebAppContext">
@@ -87,12 +89,15 @@
<Arg>
<Array type="java.lang.String">
<Item>
<SystemProperty name="basedir" default="."/>/var/webapp/docroot</Item>
<SystemProperty name="basedir" default="."/>/webapp/docroot
</Item>
</Array>
</Arg>
</New>
</Set>
<Set name="tempDirectory">/var/cache/scm/work/work/docroot</Set>
<Set name="tempDirectory">
<SystemProperty name="basedir" default="."/>/work/docroot
</Set>
</New>
<Set name="handler">