AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oh boy, the new Velocity needs commons-lang. Whee!

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6204 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2010-10-15 16:30:48 +00:00
parent 6acb1c483a
commit 9bb2916dc1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+2 -1
View File
@@ -232,10 +232,11 @@
<zipfileset src="${deploy.dir}/lib/javassist.jar"/> <zipfileset src="${deploy.dir}/lib/javassist.jar"/>
<zipfileset src="${deploy.dir}/lib/guava.jar"/> <zipfileset src="${deploy.dir}/lib/guava.jar"/>
<zipfileset src="${deploy.dir}/lib/commons-collections.jar"/> <zipfileset src="${deploy.dir}/lib/commons-collections.jar"/>
<zipfileset src="${deploy.dir}/lib/commons-lang.jar"/>
<rule pattern="com.google.**" result="cgc.@1"/> <rule pattern="com.google.**" result="cgc.@1"/>
<!-- renaming velocity borks their annoying reflective bullshit --> <!-- renaming velocity borks their annoying reflective bullshit -->
<!-- <rule pattern="org.apache.velocity.**" result="oav.@1"/> --> <!-- <rule pattern="org.apache.velocity.**" result="oav.@1"/> -->
<rule pattern="org.apache.commons.collections.**" result="oacc.@1"/> <rule pattern="org.apache.commons.**" result="oac.@1"/>
<rule pattern="com.samskivert.**" result="cs.@1"/> <rule pattern="com.samskivert.**" result="cs.@1"/>
<rule pattern="javassist.**" result="ja.@1"/> <rule pattern="javassist.**" result="ja.@1"/>
</jarjar> </jarjar>
etc/libs-incl.xml
+1
View File
@@ -6,6 +6,7 @@
<include name="ant.jar"/> <include name="ant.jar"/>
<include name="asc.jar"/> <include name="asc.jar"/>
<include name="commons-collections.jar"/> <include name="commons-collections.jar"/>
<include name="commons-lang.jar"/>
<include name="depot.jar"/> <include name="depot.jar"/>
<include name="ehcache.jar"/> <include name="ehcache.jar"/>
<include name="flexTasks.jar"/> <include name="flexTasks.jar"/>