Skip to content

brainfood / java-nginx-upload-processor

Go to a project
Toggle navigation
Toggle navigation pinning
78462bce by Adam Heath
Options

Issue #BFP-1928: Now we look in several different places for a possible 

ofbiz.home.dir, and use the first one found.  Setting ofbiz.home.dir
from the command line, or from a parent, still works.
1 parent 4985f30a
Inline Side-by-side
Showing 1 changed file with 14 additions and 1 deletions
...@@ -19,7 +19,20 @@ under the License. ...@@ -19,7 +19,20 @@ under the License.
19 --> 19 -->
20 20
21 <project name="nginx-uploader" default="jar" basedir="."> 21 <project name="nginx-uploader" default="jar" basedir=".">
22 <property name="ofbiz.home.dir" value="../ofbiz"/> 22 <first id="possible.ofbiz.home.common.xml">
23 <resources>
24 <fileset dir="..">
25 <include name="ofbiz/common.xml"/>
26 </fileset>
27 <fileset dir="/">
28 <include name="srv/ofbiz-upstream/common.xml"/>
29 <include name="opt/ofbiz-upstream/common.xml"/>
30 <include name="job/ofbiz-upstream/common.xml"/>
31 </fileset>
32 </resources>
33 </first>
34 <dirname property="possible.ofbiz.home.dir" file="${toString:possible.ofbiz.home.common.xml}"/>
35 <property name="ofbiz.home.dir" value="${possible.ofbiz.home.dir}"/>
23 <import file="${ofbiz.home.dir}/common.xml"/> 36 <import file="${ofbiz.home.dir}/common.xml"/>
24 37
25 <!-- ================================================================== --> 38 <!-- ================================================================== -->
......