Author: ekoneil
Date: Mon Mar 14 12:27:39 2005
New Revision: 157458
URL: http://svn.apache.org/viewcvs?view=rev&rev=157458
Log:
Couple of fixes to the distribution:
- stop copying commons-codec-1.3.jar into lib/netui. It's already in
lib/common.
- fix the paths to the velocity JARs in beehive-imports.xml
BB: self
DRT: none
Tests: petstoreWeb compiles in the distribution
Modified:
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/user/beehive-imports.xml
Modified: incubator/beehive/trunk/distribution.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?view=diff&r1=157457&r2=157458
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Mon Mar 14 12:27:39 2005
@@ -243,6 +243,7 @@
</fileset>
<fileset dir="${beehive.home}/netui/build/dist/webapp">
<include name="WEB-INF/lib/*.jar"/>
+ <exclude name="WEB-INF/lib/commons-codec-1.3.jar"/>
<exclude name="WEB-INF/lib/apache-xbean.jar"/>
<exclude name="WEB-INF/lib/controls.jar"/>
<exclude name="WEB-INF/lib/jsr173*.jar"/>
Modified: incubator/beehive/trunk/user/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/beehive-imports.xml?view=diff&r1=157457&r2=157458
==============================================================================
--- incubator/beehive/trunk/user/beehive-imports.xml (original)
+++ incubator/beehive/trunk/user/beehive-imports.xml Mon Mar 14 12:27:39 2005
@@ -35,8 +35,8 @@
</path>
<path id="velocity.dependency.path">
- <pathelement location="${this.dir}/lib/controls/velocity-1.4.jar"/>
- <pathelement location="${this.dir}/lib/controls/velocity-dep-1.4.jar"/>
+ <pathelement location="${this.dir}/lib/common/velocity-1.4.jar"/>
+ <pathelement location="${this.dir}/lib/common/velocity-dep-1.4.jar"/>
</path>
<path id="xbean.dependency.path">