Commit 0ab60661 authored by Nilesh Pawar's avatar Nilesh Pawar Committed by Nilesh Pawar
Browse files

ZBUG-1174: Web client does not show UTF-8 "Quoted-Printable" (#57)

* ZBUG-1174: Web client does not show UTF-8 "Quoted-Printable"

* Add jar to webapps path

* Add jar to webapps path
parent 27f9acd6
......@@ -23,6 +23,7 @@
<ant antfile="../nekohtml-1.9.13/build.xml" inheritAll="false" target="jar" />
<ant antfile="../ical4j-0.9.16-patched/build.xml" inheritAll="false" target="package" />
<ant antfile="../java-html-sanitizer-release-20190610.1/build.xml" inheritAll="false" target="jar" />
<ant antfile="../antisamy/build.xml" inheritAll="false" target="jar" />
<move file="../nekohtml-1.9.13/build/lib/nekohtml.jar" tofile="../nekohtml-1.9.13/build/lib/nekohtml-1.9.13.1z.jar"/>
<move file="../ical4j-0.9.16-patched/build/ical4j.jar" tofile="../ical4j-0.9.16-patched/build/ical4j-0.9.16-patched.jar"/>
<copy todir="${dist.dir}">
......@@ -31,6 +32,7 @@
<fileset dir="../nekohtml-1.9.13/build/lib" includes="*.jar" />
<fileset dir="../ical4j-0.9.16-patched/build" includes="*.jar" />
<fileset dir="../java-html-sanitizer-release-20190610.1/build/lib" includes="*.jar" />
<fileset dir="../antisamy/build/lib" includes="*.jar" />
</copy>
<ivy:install organisation="zimbra" module="zm-charset" revision="latest.integration" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
<ivy:install organisation="log4j" module="log4j" revision="1.2.16" settingsRef="dev.settings" from="chain-resolver" to="build-dist" overwrite="true" transitive="true" type="jar" />
......
......@@ -151,7 +151,6 @@
<dependency org="com.sun.xml.messaging.saaj" name="saaj-impl" rev="1.5.1"/>
<dependency org="com.sun.org.apache.xml.internal" name="resolver" rev="20050927"/>
<dependency org="javax.annotation" name="javax.annotation-api" rev="1.2"/>
<dependency org="org.owasp.antisamy" name="antisamy" rev="1.5.3"/>
<dependency org="org.apache.xmlgraphics" name="batik-css" rev="1.7"/>
<dependency org="org.w3c.css" name="sac" rev="1.3"/>
<dependency org="org.apache.xmlgraphics" name="batik-i18n" rev="1.9"/>
......
......@@ -190,7 +190,7 @@ sub stage_zimbra_core_lib($)
cpy_file("build/dist/neethi-3.0.2.jar", "$stage_base_dir/opt/zimbra/lib/jars/neethi-3.0.2.jar");
cpy_file("build/dist/nekohtml-1.9.13.1z.jar", "$stage_base_dir/opt/zimbra/lib/jars/nekohtml-1.9.13.1z.jar");
cpy_file("build/dist/oauth-20100527.jar", "$stage_base_dir/opt/zimbra/lib/jars/oauth-20100527.jar");
cpy_file("build/dist/antisamy-1.5.3.jar", "$stage_base_dir/opt/zimbra/lib/jars/antisamy-1.5.3.jar");
cpy_file("build/dist/antisamy-1.5.8z.jar", "$stage_base_dir/opt/zimbra/lib/jars/antisamy-1.5.8z.jar");
cpy_file("build/dist/batik-css-1.7.jar", "$stage_base_dir/opt/zimbra/lib/jars/batik-css-1.7.jar");
cpy_file("build/dist/batik-i18n-1.9.jar", "$stage_base_dir/opt/zimbra/lib/jars/batik-i18n-1.9.jar");
cpy_file("build/dist/batik-util-1.8.jar", "$stage_base_dir/opt/zimbra/lib/jars/batik-util-1.8.jar");
......@@ -311,6 +311,7 @@ sub stage_zimbra_store_lib($)
cpy_file("build/dist/jaxb-api-2.3.1.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/jaxb-api-2.3.1.jar");
cpy_file("build/dist/jaxws-api-2.3.1.jar", "$stage_base_dir/opt/zimbra/jetty_base/common/lib/jaxws-api-2.3.1.jar");
cpy_file("build/dist/saaj-impl-1.5.1.jar", "$stage_base_dir/opt/zimbra/lib/ext-common/saaj-impl-1.5.1.jar");
cpy_file("build/dist/antisamy-1.5.8z.jar", "$stage_base_dir/opt/zimbra/jetty_base/webapps/service/WEB-INF/lib/antisamy-1.5.8z.jar");
return ["."];
}
......
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