Commit d7a3d021 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Pack200 compression in plugins is now optional. It is still enabled by default. JM-1314

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10902 b35dd754-fafc-0310-a699-88a17e54d16e
parent d0a1c520
......@@ -100,6 +100,7 @@
<property name="jar.starter.name" value="startup.jar"/>
<property name="jar.dest.dir" value="${work.dir}/lib"/>
<property name="resources.dir" value="${src.dir}/resources"/>
<property name="pack200.enabled" value="true"/>
<property name="overlay.dir" value="${basedir}/custom"/>
<property name="overlay.src.dir" value="${overlay.dir}/source"/>
......@@ -1516,6 +1517,9 @@
<property name="pack200.excludes"
value="gnujaxp.jar,mail.jar,activation.jar,bouncycastle.jar,tangosol.jar"/>
<if>
<equals arg1="${pack200.enabled}" arg2="true" />
<then>
<for param="jar">
<path>
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib" includes="*.jar"
......@@ -1530,13 +1534,33 @@
</sequential>
</for>
<!-- Copy everything else to Openfire's plugin dir -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" overwrite="true">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target">
<include name="lib/*.pack"/>
<include name="web/WEB-INF/web.xml"/>
<include name="web/WEB-INF/web-custom.xml"/>
</fileset>
</copy>
<!-- Excluded pack files need to be copied over as well -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar/lib" overwrite="true">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib"
includes="${pack200.excludes}"/>
</copy>
</then>
<else>
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" overwrite="true">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target">
<include name="lib/*.jar"/>
<include name="web/WEB-INF/web.xml"/>
<include name="web/WEB-INF/web-custom.xml"/>
</fileset>
</copy>
</else>
</if>
<!-- Copy everything else to Openfire's plugin dir -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar" overwrite="true">
<fileset dir="@{pluginsrc}/@{plugin}">
<include name="classes/**/*.*"/>
</fileset>
......@@ -1551,12 +1575,6 @@
</fileset>
</copy>
<!-- Excluded pack files need to be copied over as well -->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/jar/lib" overwrite="true">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/lib"
includes="${pack200.excludes}"/>
</copy>
<!-- Jar the plugin -->
<jar jarfile="${plugin.dest.dir}/@{plugin}.jar">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/jar"/>
......
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