Commit aec754a6 authored by Bill Lynch's avatar Bill Lynch Committed by bill

Two plugin changes: 1) "classes" dir included in plugins, 2) developer written...

Two plugin changes: 1) "classes" dir included in plugins, 2) developer written web.xml file munged to web-custom.xml in WEB-INF dir.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1340 b35dd754-fafc-0310-a699-88a17e54d16e
parent a7403b88
...@@ -795,8 +795,6 @@ ...@@ -795,8 +795,6 @@
<attribute name="pluginsrc" /> <attribute name="pluginsrc" />
<sequential> <sequential>
<echo message="\n\nBuilding @{plugin}...\n\n" />
<!-- For each plugin, copile code, make a jar and copy resources. --> <!-- For each plugin, copile code, make a jar and copy resources. -->
<mkdir dir="${plugin.dev.dest.dir}" /> <mkdir dir="${plugin.dev.dest.dir}" />
<mkdir dir="${plugin.dev.dest.dir}/@{plugin}" /> <mkdir dir="${plugin.dev.dest.dir}/@{plugin}" />
...@@ -839,6 +837,12 @@ ...@@ -839,6 +837,12 @@
<fileset dir="@{pluginsrc}/@{plugin}/lib" includes="**/*.*" /> <fileset dir="@{pluginsrc}/@{plugin}/lib" includes="**/*.*" />
</copy> </copy>
<!-- Copy anything in the plugin's lib dir to the target lib dir -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF" failonerror="false">
<fileset dir="@{pluginsrc}/@{plugin}/src/web/WEB-INF" includes="web.xml" />
<mapper type="glob" from="web.xml" to="web-custom.xml" />
</copy>
<!-- Copy the plugin.xml and documentation to the target dir, code below assumes it's there --> <!-- Copy the plugin.xml and documentation to the target dir, code below assumes it's there -->
<mkdir dir="${plugin.dev.dest.dir}/@{plugin}/jar" /> <mkdir dir="${plugin.dev.dest.dir}/@{plugin}/jar" />
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" failonerror="false"> <copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" failonerror="false">
...@@ -954,6 +958,10 @@ ...@@ -954,6 +958,10 @@
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target"> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target">
<include name="lib/*.jar" /> <include name="lib/*.jar" />
<include name="web/WEB-INF/web.xml" /> <include name="web/WEB-INF/web.xml" />
<include name="web/WEB-INF/web-custom.xml" />
</fileset>
<fileset dir="@{pluginsrc}/@{plugin}">
<include name="classes/**/*.*" />
</fileset> </fileset>
<fileset dir="@{pluginsrc}/@{plugin}/src"> <fileset dir="@{pluginsrc}/@{plugin}/src">
<include name="web/**/*.*" /> <include name="web/**/*.*" />
......
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