Commit e1ba82d9 authored by Guus der Kinderen's avatar Guus der Kinderen

OF-930: Resources from subdirectories should also be considered.

parent 984e5e1b
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</path> </path>
<path id="custom.dependencies"> <path id="custom.dependencies">
<fileset dir="${overlay.lib.dir}" includes="*.jar"/> <fileset dir="${overlay.lib.dir}" includes="**/*.jar"/>
</path> </path>
<path id="test.dependencies"> <path id="test.dependencies">
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
<then> <then>
<mkdir dir="${jar.dest.dir}"/> <mkdir dir="${jar.dest.dir}"/>
<copy todir="${jar.dest.dir}" overwrite="true"> <copy todir="${jar.dest.dir}" overwrite="true">
<fileset dir="${overlay.lib.dir}" includes="*.*"/> <fileset dir="${overlay.lib.dir}" includes="**/*.*"/>
</copy> </copy>
</then> </then>
<else><echo>No custom lib here </echo></else> <else><echo>No custom lib here </echo></else>
...@@ -515,7 +515,7 @@ ...@@ -515,7 +515,7 @@
<mkdir dir="${jspc.jsp.src.dir}"/> <mkdir dir="${jspc.jsp.src.dir}"/>
<copy todir="${jspc.jsp.src.dir}"> <copy todir="${jspc.jsp.src.dir}">
<fileset dir="${web.dir}"/> <fileset dir="${web.dir}" includes="**/*"/>
</copy> </copy>
<!-- copy overlay --> <!-- copy overlay -->
...@@ -524,7 +524,7 @@ ...@@ -524,7 +524,7 @@
<equals arg1="${overlay.webdir.found}" arg2="true"/> <equals arg1="${overlay.webdir.found}" arg2="true"/>
<then> <then>
<copy todir="${jspc.jsp.src.dir}" overwrite="true"> <copy todir="${jspc.jsp.src.dir}" overwrite="true">
<fileset dir="${overlay.web.dir}"/> <fileset dir="${overlay.web.dir}" includes="**/*"/>
</copy> </copy>
</then> </then>
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment