Skip to content

brainfood / ofbiz-directcontrolservlet

Go to a project
Toggle navigation
Toggle navigation pinning
199cb8dc by Adam Heath
Options

Issue #54010: Minor changes to make this work with ofbiz upstream; this 

currently requires changes in an upstream branch, OFBIZ-6270.
1 parent 494816c9
Inline Side-by-side
Showing 3 changed files with 2 additions and 2 deletions
...@@ -22,6 +22,7 @@ under the License. ...@@ -22,6 +22,7 @@ under the License.
22 <first id="possible.ofbiz.home.common.xml"> 22 <first id="possible.ofbiz.home.common.xml">
23 <resources> 23 <resources>
24 <fileset dir=".."> 24 <fileset dir="..">
25 <include name="apache-ofbiz/common.xml"/>
25 <include name="ofbiz/common.xml"/> 26 <include name="ofbiz/common.xml"/>
26 </fileset> 27 </fileset>
27 <fileset dir="/"> 28 <fileset dir="/">
...@@ -43,7 +44,7 @@ under the License. ...@@ -43,7 +44,7 @@ under the License.
43 <property name="name" value="direct-control"/> 44 <property name="name" value="direct-control"/>
44 45
45 <path id="local.class.path"> 46 <path id="local.class.path">
46 <!--<fileset dir="${lib.dir}" includes="*.jar"/>--> 47 <fileset dir="${lib.dir}" includes="*.jar"/>
47 <fileset dir="${ofbiz.home.dir}/framework/webapp/lib" includes="*.jar"/> 48 <fileset dir="${ofbiz.home.dir}/framework/webapp/lib" includes="*.jar"/>
48 <fileset dir="${ofbiz.home.dir}/framework/webapp/build/lib" includes="*.jar"/> 49 <fileset dir="${ofbiz.home.dir}/framework/webapp/build/lib" includes="*.jar"/>
49 <fileset dir="${ofbiz.home.dir}/framework/base/lib" includes="*.jar"/> 50 <fileset dir="${ofbiz.home.dir}/framework/base/lib" includes="*.jar"/>
......
No preview for this file type
...@@ -64,7 +64,6 @@ import groovy.lang.Script; ...@@ -64,7 +64,6 @@ import groovy.lang.Script;
64 64
65 import org.codehaus.groovy.runtime.InvokerHelper; 65 import org.codehaus.groovy.runtime.InvokerHelper;
66 import org.ofbiz.base.json.JSON; 66 import org.ofbiz.base.json.JSON;
67 import org.ofbiz.base.json.ParseException;
68 67
69 import net.sf.json.JSONObject; 68 import net.sf.json.JSONObject;
70 import net.sf.json.JsonConfig; 69 import net.sf.json.JsonConfig;
......