summaryrefslogtreecommitdiff
path: root/swext
diff options
context:
space:
mode:
authorDamjan Jovanovic <damjan@apache.org>2016-08-07 19:24:03 +0000
committerDamjan Jovanovic <damjan@apache.org>2016-08-07 19:24:03 +0000
commitca68acda60fa352d2a272a2a10d15a4cc209a681 (patch)
tree76d808631e0a71ea683c8d7852f9d60f9e49dd06 /swext
parent5b6c4bddf6134f377a61446d8bcf1be2f096aad1 (diff)
Merge branches/gbuild-reintegration to trunk.
Notes
Notes: ignore: obsolete
Diffstat (limited to 'swext')
-rw-r--r--swext/mediawiki/build.xml6
1 files changed, 1 insertions, 5 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index 165105d0cb3a..7fcae6232652 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -95,7 +95,7 @@
<jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
<manifest>
<!-- FIXME: Set Class-Path correctly for the system case !-->
- <attribute name="Class-Path" value="commons-codec-1.9.jar commons-lang3-3.3.jar commons-httpclient-3.1.jar commons-logging-1.1.3.jar"/>
+ <attribute name="Class-Path" value="file:///usr/local/share/java/classes/commons-codec.jar file:///usr/local/share/java/classes/commons-lang.jar file:///usr/local/share/java/classes/commons-httpclient.jar file:///usr/local/share/java/classes/commons-logging.jar"/>
<attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest>
</jar>
@@ -126,10 +126,6 @@
<zip destfile="${dist}/${name}.${ext}">
<fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
<fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
- <file file="${commons-codec-jar}"/>
- <file file="${commons-httpclient-jar}"/>
- <file file="${commons-lang-jar}"/>
- <file file="${commons-logging-jar}"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>