Menu
▾
▴
[Springframework-cvs] spring build.xml,1.314,1.315
|
From: Arjen J.W. P. <po...@us...> - 2008-10-27 14:04:28
|
Update of /cvsroot/springframework/spring In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12582 Modified Files: build.xml Log Message: Removed references to bnd-generated manifests. Index: build.xml =================================================================== RCS file: /cvsroot/springframework/spring/build.xml,v retrieving revision 1.314 retrieving revision 1.315 diff -C2 -d -r1.314 -r1.315 *** build.xml 23 Oct 2008 22:37:22 -0000 1.314 --- build.xml 27 Oct 2008 14:04:15 -0000 1.315 *************** *** 496,500 **** </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"/> --- 496,500 ---- </delete> ! <jar jarfile="${dist.dir}/modules/spring-aop.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aop.packages"/> *************** *** 509,513 **** </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"/> --- 509,513 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-beans.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.beans.packages"/> *************** *** 522,526 **** </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"/> --- 522,526 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-context.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.packages"/> *************** *** 535,539 **** </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"/> --- 535,539 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-context-support.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.context.support.packages"/> *************** *** 547,551 **** </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"/> --- 547,551 ---- </jar> ! <jarjar jarfile="${dist.dir}/modules/spring-core.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.core.packages"/> *************** *** 562,566 **** </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"/> --- 562,566 ---- </jarjar> ! <jar jarfile="${dist.dir}/modules/spring-jdbc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jdbc.packages"/> *************** *** 574,578 **** </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"/> --- 574,578 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-jms.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.jms.packages"/> *************** *** 587,591 **** </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"/> --- 587,591 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-orm.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.orm.packages"/> *************** *** 599,603 **** </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"/> --- 599,603 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-test.jar"> <fileset dir="${target.mockclasses.dir}"> <patternset refid="spring.test.packages"/> *************** *** 611,615 **** </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"/> --- 611,615 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-tx.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tx.packages"/> *************** *** 624,628 **** </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"/> --- 624,628 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-web.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.web.packages"/> *************** *** 636,640 **** </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"/> --- 636,640 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.packages"/> *************** *** 648,652 **** </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"/> --- 648,652 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-portlet.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.portlet.packages"/> *************** *** 660,664 **** </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"/> --- 660,664 ---- </jar> ! <jar jarfile="${dist.dir}/modules/spring-webmvc-struts.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.webmvc.struts.packages"/> *************** *** 686,689 **** --- 686,693 ---- classpathref="bundlor-classpath"/> + <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-agent.jar" outputPath="${dist.dir}/modules/spring-agent.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.mf"/> + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-aop.jar" outputPath="${dist.dir}/modules/spring-aop.jar" mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" *************** *** 726,729 **** --- 730,737 ---- manifestTemplatePath="${bundlor.mf.dir}/org.springframework.test.mf"/> + <bundlor:bundlor bundlePath="${dist.dir}/weaving/spring-tomcat-weaver.jar" outputPath="${dist.dir}/weaving/spring-tomcat-weaver.jar" + mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" + manifestTemplatePath="${bundlor.mf.dir}/org.springframework.instrument.classloading.mf"/> + <bundlor:bundlor bundlePath="${dist.dir}/modules/spring-tx.jar" outputPath="${dist.dir}/modules/spring-tx.jar" mergeExistingHeaders="true" bundleVersion="${spring-version-osgi}" *************** *** 982,986 **** </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"/> --- 990,994 ---- </delete> ! <jar jarfile="${dist.dir}/weaving/spring-agent.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.agent.packages"/> *************** *** 995,999 **** </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"/> --- 1003,1007 ---- </jar> ! <jar jarfile="${dist.dir}/weaving/spring-aspects.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.aspects.packages"/> *************** *** 1007,1011 **** </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"/> --- 1015,1019 ---- </jar> ! <jar jarfile="${dist.dir}/weaving/spring-tomcat-weaver.jar"> <fileset dir="${target.classes.dir}"> <patternset refid="spring.tomcat.weaver.packages"/> |
