Merge pull request #1563 from adamretter/hotfix/jetty-tmp

Don't try and manually set a Jetty temp folder
eXist-db · Sep 26, 2017 · ee3153c · ee3153c
2 parents 622e86d + 3a1c629
commit ee3153c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 18 deletions.
diff --git a/tools/jetty/etc/jetty.xml b/tools/jetty/etc/jetty.xml
@@ -148,12 +148,4 @@
       </Call>
     </Ref -->
 
-    <!-- =========================================================== -->
-    <!-- change java.io.tmpdir default value                         -->
-    <!-- =========================================================== -->
-    <Call class="java.lang.System" name="setProperty">
-        <Arg>java.io.tmpdir</Arg>
-        <Arg><Property name="jetty.base" default="."/>/tmp</Arg>
-    </Call>
-
 </Configure>
diff --git a/tools/jetty/etc/standalone-jetty.xml b/tools/jetty/etc/standalone-jetty.xml
@@ -148,12 +148,4 @@
       </Call>
     </Ref -->
 
-    <!-- =========================================================== -->
-    <!-- change java.io.tmpdir default value                         -->
-    <!-- =========================================================== -->
-    <Call class="java.lang.System" name="setProperty">
-        <Arg>java.io.tmpdir</Arg>
-        <Arg><Property name="jetty.base" default="."/>/tmp</Arg>
-    </Call>
-
 </Configure>
diff --git a/tools/jetty/tmp/.DO_NOT_DELETE b/tools/jetty/tmp/.DO_NOT_DELETE
diff --git a/tools/jetty/webapps/exist-webapp-context.xml b/tools/jetty/webapps/exist-webapp-context.xml
@@ -6,7 +6,6 @@
     <Set name="contextPath">/exist</Set>
     <Set name="war"><Property name="jetty.home" default="."/>/../../webapp/</Set>
     <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
-    <Set name="tempDirectory"><Property name="jetty.base" default="."/>/tmp</Set>
     <Set name="securityHandler">
         <New class="org.eclipse.jetty.security.ConstraintSecurityHandler">
             <Set name="loginService">