Commit e25506e1 authored by Derek DeMoro's avatar Derek DeMoro Committed by derek

Fixed jspc issue in plugins.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1164 b35dd754-fafc-0310-a699-88a17e54d16e
parent c2381a98
...@@ -835,7 +835,9 @@ ...@@ -835,7 +835,9 @@
not fail on an error since the web dir might not exist. not fail on an error since the web dir might not exist.
--> -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web"> <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web">
<fileset dir="@{pluginsrc}/@{plugin}/src/web" /> <fileset dir="@{pluginsrc}/@{plugin}/src/web">
<exclude name="WEB-INF/web.xml" />
</fileset>
<fileset dir="${web.dir}"> <fileset dir="${web.dir}">
<include name="WEB-INF/**/*.*" /> <include name="WEB-INF/**/*.*" />
<exclude name="WEB-INF/web.xml" /> <exclude name="WEB-INF/web.xml" />
...@@ -869,6 +871,12 @@ ...@@ -869,6 +871,12 @@
<!-- Use xmltask to merge the generated web.xml file and a developer one (if any) --> <!-- Use xmltask to merge the generated web.xml file and a developer one (if any) -->
<available property="plugin.@{plugin}.webxml.available" <available property="plugin.@{plugin}.webxml.available"
type="file" file="@{pluginsrc}/@{plugin}/src/web/WEB-INF/web.xml" /> type="file" file="@{pluginsrc}/@{plugin}/src/web/WEB-INF/web.xml" />
<echo>
plugin: @{plugin}
plugin.@{plugin}.webxml.available: ${plugin.@{plugin}.webxml.available}
</echo>
<if> <if>
<equals arg1="${plugin.@{plugin}.webxml.available}" arg2="true" /> <equals arg1="${plugin.@{plugin}.webxml.available}" arg2="true" />
<then> <then>
...@@ -890,6 +898,8 @@ ...@@ -890,6 +898,8 @@
</then> </then>
</if> </if>
<input/>
<!-- Compile java classes --> <!-- Compile java classes -->
<javac <javac
destdir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes" destdir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes"
......
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