Menu
▾
▴
[Springframework-cvs] spring build.xml,1.312,1.313
|
From: Ben H. <ne...@us...> - 2008-10-23 16:19:14
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26211 Modified Files: build.xml Log Message: Removed bnd Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.312 retrieving revision 1.313 diff -C2 -d -r1.312 -r1.313 *** build.xml 14 Oct 2008 09:02:43 -0000 1.312 --- build.xml 23 Oct 2008 16:19:07 -0000 1.313 *************** *** 202,209 **** </patternset> - - <!-- BND tool taskdef (required for the OSGi manifest entries) --> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${lib.dir}/bnd/bnd.jar"/> - <!-- Jar Jar Links taskdef (required for repackaging ASM) --> <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${lib.dir}/jarjar/jarjar.jar"/> --- 202,205 ---- *************** *** 455,464 **** </manifest> </jarjar> - - <bndwrap definitions="${basedir}/osgi/bnd" output="${dist.dir}"> - <fileset dir="${dist.dir}" includes="spring.jar"/> - </bndwrap> - <move file="${dist.dir}/spring.bar" tofile="${dist.dir}/spring.jar"/> - </target> --- 451,454 ---- *************** *** 496,500 **** </delete> ! <jar jarfile="${dist.dir}/modules/spring-aop.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aop.packages"/> --- 486,490 ---- </delete> ! <jar jarfile="${dist.dir}/modules/spring-aop.jar" manifest="${basedir}/osgi/manifest/spring-aop.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aop.packages"/> *************** *** 509,513 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-beans.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.beans.packages"/> --- 499,503 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-beans.jar" manifest="${basedir}/osgi/manifest/spring-beans.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.beans.packages"/> *************** *** 522,526 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-context.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.packages"/> --- 512,516 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-context.jar" manifest="${basedir}/osgi/manifest/spring-context.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.packages"/> *************** *** 535,539 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-context-support.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.support.packages"/> --- 525,529 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-context-support.jar" manifest="${basedir}/osgi/manifest/spring-context-support.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.support.packages"/> *************** *** 547,551 **** </jar> ! <jarjar jarfile="${dist.dir}/modules/spring-core.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.core.packages"/> --- 537,541 ---- </jar> ! <jarjar jarfile="${dist.dir}/modules/spring-core.jar" manifest="${basedir}/osgi/manifest/spring-core.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.core.packages"/> *************** *** 562,566 **** </jarjar> ! <jar jarfile="${dist.dir}/modules/spring-jdbc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jdbc.packages"/> --- 552,556 ---- </jarjar> ! <jar jarfile="${dist.dir}/modules/spring-jdbc.jar" manifest="${basedir}/osgi/manifest/spring-jdbc.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jdbc.packages"/> *************** *** 574,578 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-jms.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jms.packages"/> --- 564,568 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-jms.jar" manifest="${basedir}/osgi/manifest/spring-jms.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jms.packages"/> *************** *** 587,591 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-orm.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.orm.packages"/> --- 577,581 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-orm.jar" manifest="${basedir}/osgi/manifest/spring-orm.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.orm.packages"/> *************** *** 599,603 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-test.jar"> <fileset dir="${target.mockclasses.dir}"> <patternset refid="spring.test.packages"/> --- 589,593 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-test.jar" manifest="${basedir}/osgi/manifest/spring-test.mf"> <fileset dir="${target.mockclasses.dir}"> <patternset refid="spring.test.packages"/> *************** *** 611,615 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-tx.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tx.packages"/> --- 601,605 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-tx.jar" manifest="${basedir}/osgi/manifest/spring-tx.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tx.packages"/> *************** *** 624,628 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-web.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.web.packages"/> --- 614,618 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-web.jar" manifest="${basedir}/osgi/manifest/spring-web.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.web.packages"/> *************** *** 636,640 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.packages"/> --- 626,630 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc.jar" manifest="${basedir}/osgi/manifest/spring-webmvc.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.packages"/> *************** *** 648,652 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-portlet.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.portlet.packages"/> --- 638,642 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-portlet.jar" manifest="${basedir}/osgi/manifest/spring-webmvc-portlet.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.portlet.packages"/> *************** *** 660,664 **** </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-struts.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.struts.packages"/> --- 650,654 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-struts.jar" manifest="${basedir}/osgi/manifest/spring-webmvc-struts.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.struts.packages"/> *************** *** 671,686 **** </manifest> </jar> - - <!-- osgi wrapper --> - <bndwrap definitions="${basedir}/osgi/bnd" output="${dist.dir}/modules"> - <fileset dir="${dist.dir}/modules" includes="*.jar"/> - </bndwrap> - <move todir="${dist.dir}/modules"> - <fileset dir="${dist.dir}/modules"> - <include name="*.bar"/> - </fileset> - <mapper type="glob" from="*.bar" to="*.jar"/> - </move> - </target> --- 661,664 ---- *************** *** 919,923 **** </delete> ! <jar jarfile="${dist.dir}/weaving/spring-agent.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.agent.packages"/> --- 897,901 ---- </delete> ! <jar jarfile="${dist.dir}/weaving/spring-agent.jar" manifest="${basedir}/osgi/manifest/spring-agent.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.agent.packages"/> *************** *** 932,936 **** </jar> ! <jar jarfile="${dist.dir}/weaving/spring-aspects.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aspects.packages"/> --- 910,914 ---- </jar> ! <jar jarfile="${dist.dir}/weaving/spring-aspects.jar" manifest="${basedir}/osgi/manifest/spring-aspects.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aspects.packages"/> *************** *** 944,948 **** </jar> ! <jar jarfile="${dist.dir}/weaving/spring-tomcat-weaver.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tomcat.weaver.packages"/> --- 922,926 ---- </jar> ! <jar jarfile="${dist.dir}/weaving/spring-tomcat-weaver.jar" manifest="${basedir}/osgi/manifest/spring-tomcat-weaver.mf"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tomcat.weaver.packages"/> *************** *** 955,971 **** </manifest> </jar> - - <!-- osgi wrappers --> - <bndwrap definitions="${basedir}/osgi/bnd" output="${dist.dir}/weaving"> - <fileset dir="${dist.dir}/weaving" includes="spring-aspects.jar"/> - </bndwrap> - - <move todir="${dist.dir}/weaving"> - <fileset dir="${dist.dir}/weaving"> - <include name="*.bar"/> - </fileset> - <mapper type="glob" from="*.bar" to="*.jar"/> - </move> - </target> --- 933,936 ---- |
