Thanks. Your email client is line wrapping your inlined patch. Either set your client to not do that (preferred), or send as attachment.
"Eric Pugh" <[EMAIL PROTECTED]> writes: > I have seen files attached that contain the patch (I think they ended in > .patch), how can I produce these files. Presumably, they prevent these > types of issues. > > I looked at the souce, and the ant files they refer to are not correct (for > maven b4). The appropriate section for the maven delegators is: > > <!-- maven:start --> > > <!-- > ================================================================== --> > <!-- D E L E G A T O R > --> > <!-- > ================================================================== --> > > > <target name="maven:site"> > <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/> > </target> > > > <target name="maven:dist"> > <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/> > </target> > > > <target name="maven:env"> > <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/> > </target> > > > <target name="maven:test"> > <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/> > </target> > > > <target name="maven:announce"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="announce"/> > </target> > > > <target name="maven:activity-log"> > <ant antfile="${maven.home}/plugins/docs/build.xml" > target="activity-log"/> > </target> > > > <target name="maven:compile"> > <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/> > </target> > > > <target name="maven:validate-war"> > <ant antfile="${maven.home}/plugins/j2ee/build.xml" > target="validate-war"/> > </target> > > > <target name="maven:pdf"> > <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/> > </target> > > > <target name="maven:iutest"> > <ant antfile="${maven.home}/plugins/iutest/build.xml" > target="iutest"/> > </target> > > > <target name="maven:deploy-site"> > <ant antfile="${maven.home}/plugins/docs/build.xml" > target="deploy-site"/> > </target> > > > <target name="maven:deploy-dist"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="deploy-dist"/> > </target> > > > <target name="maven:war"> > <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/> > </target> > > > <target name="maven:verify-project"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="verify-project"/> > </target> > > > <target name="maven:cvs-change-log"> > <ant antfile="${maven.home}/plugins/docs/build.xml" > target="cvs-change-log"/> > </target> > > > <target name="maven:ear"> > <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/> > </target> > > > <target name="maven:cross-ref"> > <ant antfile="${maven.home}/plugins/docs/build.xml" > target="cross-ref"/> > </target> > > > <target name="maven:update-jars"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="update-jars"/> > </target> > > > <target name="maven:validate-pom"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="validate-pom"/> > </target> > > > <target name="maven:install-jar"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="install-jar"/> > </target> > > > <target name="maven:fo"> > <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/> > </target> > > > <target name="maven:javadocs"> > <ant antfile="${maven.home}/plugins/docs/build.xml" > target="javadocs"/> > </target> > > > <target name="maven:validate-struts-war"> > <ant antfile="${maven.home}/plugins/struts/build.xml" > target="validate-struts-war"/> > </target> > > > <target name="maven:task-list"> > <ant antfile="${maven.home}/plugins/docs/build.xml" > target="task-list"/> > </target> > > > <target name="maven:ejb"> > <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ejb"/> > </target> > > > <target name="maven:docs"> > <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/> > </target> > > > <target name="maven:clean"> > <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/> > </target> > > > <target name="maven:dist-build"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="dist-build"/> > </target> > > > <target name="maven:metrics"> > <ant antfile="${maven.home}/plugins/metrics/build.xml" > target="metrics"/> > </target> > > > <target name="maven:docs-quick"> > <ant antfile="${maven.home}/plugins/docs/build.xml" > target="docs-quick"/> > </target> > > > <target name="maven:run-singletest"> > <ant antfile="${maven.home}/plugins/test/build.xml" > target="run-singletest"/> > </target> > > > <target name="maven:check-source"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="check-source"/> > </target> > > > <target name="maven:generate-reactor"> > <ant antfile="${maven.home}/plugins/reactor/build.xml" > target="generate-reactor"/> > </target> > > > <target name="maven:jar"> > <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/> > </target> > > > <target name="maven:maven-update"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="maven-update"/> > </target> > > > <target name="maven:gump-descriptor"> > <ant antfile="${maven.home}/plugins/core/build.xml" > target="gump-descriptor"/> > </target> > > > <!-- maven:end --> > > Eric > > > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] > Sent: Wednesday, June 26, 2002 6:37 PM > To: Turbine Developers List > Subject: Re: [patch] fulcrum build.xml > > > This patch wrapped as well. If these aren't relevant, someone please > comment. > > "Eric Pugh" <[EMAIL PROTECTED]> writes: > >> As well, the fulcrum build.xml is not up to date. As you can tell, I am >> slowly migrating to T2.2! >> >> Eric >> >> cvs -z9 -q diff -w -i build.xml (in directory >> C:\java\jakarta-turbine-stratum\) >> Index: build.xml >> =================================================================== >> RCS file: /home/cvspublic/jakarta-turbine-stratum/build.xml,v >> retrieving revision 1.27 >> diff -w -i -r1.27 build.xml >> 21,23c21,63 >> < <target >> < name="maven:site"> >> < <ant antfile="${maven.home}/build-docs.xml" target="site"/> >> --- >> > >>> <target name="maven:site"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" > target="site"/> > >> </target> >>> >>> >>> <target name="maven:dist"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" > target="dist"/> > >> </target> >>> >>> >>> <target name="maven:env"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/> >>> </target> >>> >>> >>> <target name="maven:test"> >>> <ant antfile="${maven.home}/plugins/test/build.xml" > target="test"/> > >> </target> >>> >>> >>> <target name="maven:announce"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="announce"/> >> > </target> >>> >>> >>> <target name="maven:activity-log"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="activity-log"/> >> > </target> >>> >>> >>> <target name="maven:compile"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="compile"/> >> > </target> >>> >>> >>> <target name="maven:validate-war"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" >> target="validate-war"/> >> > </target> >>> >>> >>> <target name="maven:pdf"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/> >> 26,28c66,68 >> < <target >> < name="maven:jar"> >> < <ant antfile="${maven.home}/build-maven.xml" target="jar"/> >> --- >> > >>> <target name="maven:iutest"> >>> <ant antfile="${maven.home}/plugins/iutest/build.xml" >> target="iutest"/> >> 31,33c71,73 >> < <target >> < name="maven:install-jar"> >> < <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/> >> --- >> > >>> <target name="maven:deploy-site"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="deploy-site"/> >> 36,38c76,78 >> < <target >> < name="maven:env"> >> < <ant antfile="${maven.home}/build-maven.xml" target="env"/> >> --- >> > >>> <target name="maven:deploy-dist"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="deploy-dist"/> >> 41,43c81,83 >> < <target >> < name="maven:docs"> >> < <ant antfile="${maven.home}/build-docs.xml" target="docs"/> >> --- >> > >>> <target name="maven:war"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/> >> 46,48c86,88 >> < <target >> < name="maven:test"> >> < <ant antfile="${maven.home}/build-test.xml" target="test"/> >> --- >> > >>> <target name="maven:verify-project"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="verify-project"/> >> 51,53c91,93 >> < <target >> < name="maven:run-singletest"> >> < <ant antfile="${maven.home}/build-test.xml" > target="run-singletest"/> > > --- >> > >>> <target name="maven:cvs-change-log"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="cvs-change-log"/> >> 56,58c96,98 >> < <target >> < name="maven:clean"> >> < <ant antfile="${maven.home}/build-maven.xml" target="clean"/> >> --- >> > >>> <target name="maven:ear"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/> >> 61,63c101,103 >> < <target >> < name="maven:metrics"> >> < <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/> >> --- >> > >>> <target name="maven:cross-ref"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="cross-ref"/> >> 66,68c106,108 >> < <target >> < name="maven:dist"> >> < <ant antfile="${maven.home}/build-maven.xml" target="dist"/> >> --- >> > >>> <target name="maven:update-jars"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="update-jars"/> >> 71,73c111,113 >> < <target >> < name="maven:deploy-site"> >> < <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/> >> --- >> > >>> <target name="maven:validate-pom"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="validate-pom"/> >> 76,78c116,118 >> < <target >> < name="maven:gump-descriptor"> >> < <ant antfile="${maven.home}/build-maven.xml" >> target="gump-descriptor"/> >> --- >> > >>> <target name="maven:install-jar"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="install-jar"/> >> 81,83c121,123 >> < <target >> < name="maven:javadocs"> >> < <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/> >> --- >> > >>> <target name="maven:fo"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/> >> 86,88c126,128 >> < <target >> < name="maven:compile"> >> < <ant antfile="${maven.home}/build-maven.xml" target="compile"/> >> --- >> > >>> <target name="maven:javadocs"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="javadocs"/> >> 91,93c131,133 >> < <target >> < name="maven:update-jars"> >> < <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/> >> --- >> > >>> <target name="maven:validate-struts-war"> >>> <ant antfile="${maven.home}/plugins/struts/build.xml" >> target="validate-struts-war"/> >> 95a136,201 >> > >>> <target name="maven:task-list"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="task-list"/> >> > </target> >>> >>> >>> <target name="maven:ejb"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ejb"/> >>> </target> >>> >>> >>> <target name="maven:docs"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" > target="docs"/> > >> </target> >>> >>> >>> <target name="maven:clean"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="clean"/> >> > </target> >>> >>> >>> <target name="maven:dist-build"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="dist-build"/> >> > </target> >>> >>> >>> <target name="maven:metrics"> >>> <ant antfile="${maven.home}/plugins/metrics/build.xml" >> target="metrics"/> >> > </target> >>> >>> >>> <target name="maven:docs-quick"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="docs-quick"/> >> > </target> >>> >>> >>> <target name="maven:run-singletest"> >>> <ant antfile="${maven.home}/plugins/test/build.xml" >> target="run-singletest"/> >> > </target> >>> >>> >>> <target name="maven:check-source"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="check-source"/> >> > </target> >>> >>> >>> <target name="maven:generate-reactor"> >>> <ant antfile="${maven.home}/plugins/reactor/build.xml" >> target="generate-reactor"/> >> > </target> >>> >>> >>> <target name="maven:jar"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/> >>> </target> >>> >>> >>> <target name="maven:maven-update"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="maven-update"/> >> > </target> >>> >>> >>> <target name="maven:gump-descriptor"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="gump-descriptor"/> >> > </target> >>> >>> >> >> >> *****CVS exited normally with code 1***** >> >> cvs -z9 -q diff -w -i build.xml (in directory >> C:\java\jakarta-turbine-fulcrum\) >> Index: build.xml >> =================================================================== >> RCS file: /home/cvspublic/jakarta-turbine-fulcrum/build.xml,v >> retrieving revision 1.55 >> diff -w -i -r1.55 build.xml >> 21,23c21,23 >> < <target >> < name="maven:site"> >> < <ant antfile="${maven.home}/build-docs.xml" target="site"/> >> --- >> > >>> <target name="maven:site"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/> >> 26,28c26,33 >> < <target >> < name="maven:update-jars"> >> < <ant antfile="${maven.home}/build-maven.xml" target="update-jars"/> >> --- >> > >>> <target name="maven:dist"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/> >>> </target> >>> >>> >>> <target name="maven:env"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/> >> 31,33c36,38 >> < <target >> < name="maven:jar"> >> < <ant antfile="${maven.home}/build-maven.xml" target="jar"/> >> --- >> > >>> <target name="maven:test"> >>> <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/> >> 36,38c41,43 >> < <target >> < name="maven:install-jar"> >> < <ant antfile="${maven.home}/build-maven.xml" target="install-jar"/> >> --- >> > >>> <target name="maven:announce"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/> >> 41,43c46,48 >> < <target >> < name="maven:env"> >> < <ant antfile="${maven.home}/build-maven.xml" target="env"/> >> --- >> > >>> <target name="maven:activity-log"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="activity-log"/> >> 46,48c51,53 >> < <target >> < name="maven:docs"> >> < <ant antfile="${maven.home}/build-docs.xml" target="docs"/> >> --- >> > >>> <target name="maven:compile"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/> >> 51,53c56,58 >> < <target >> < name="maven:test"> >> < <ant antfile="${maven.home}/build-test.xml" target="test"/> >> --- >> > >>> <target name="maven:validate-war"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" >> target="validate-war"/> >> 56,58c61,63 >> < <target >> < name="maven:clean" depends="clean"> >> < <ant antfile="${maven.home}/build-maven.xml" target="clean"/> >> --- >> > >>> <target name="maven:pdf"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/> >> 61,63c66,68 >> < <target >> < name="maven:metrics"> >> < <ant antfile="${maven.home}/build-metrics.xml" target="metrics"/> >> --- >> > >>> <target name="maven:iutest"> >>> <ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/> >> 66,69c71,73 >> < <target >> < name="maven:dist" >> < depends="maven:compile"> >> < <ant antfile="${maven.home}/build-maven.xml" target="dist"/> >> --- >> > >>> <target name="maven:deploy-site"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="deploy-site"/> >> 72,74c76,78 >> < <target >> < name="maven:deploy-site"> >> < <ant antfile="${maven.home}/build-docs.xml" target="deploy-site"/> >> --- >> > >>> <target name="maven:deploy-dist"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="deploy-dist"/> >> 77,79c81,83 >> < <target >> < name="maven:gump-descriptor"> >> < <ant antfile="${maven.home}/build-maven.xml" >> target="gump-descriptor"/> >> --- >> > >>> <target name="maven:war"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/> >> 82,84c86,88 >> < <target >> < name="maven:javadocs"> >> < <ant antfile="${maven.home}/build-docs.xml" target="javadocs"/> >> --- >> > >>> <target name="maven:verify-project"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="verify-project"/> >> 87,89c91,93 >> < <target >> < name="maven:compile"> >> < <ant antfile="${maven.home}/build-maven.xml" target="compile"/> >> --- >> > >>> <target name="maven:cvs-change-log"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="cvs-change-log"/> >> 92,94c96,133 >> < <target >> < name="maven:init"> >> < <ant antfile="${maven.home}/build-maven.xml" target="init"/> >> --- >> > >>> <target name="maven:ear"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/> >>> </target> >>> >>> >>> <target name="maven:cross-ref"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" > target="cross-ref"/> > >> </target> >>> >>> >>> <target name="maven:update-jars"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="update-jars"/> >> > </target> >>> >>> >>> <target name="maven:validate-pom"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="validate-pom"/> >> > </target> >>> >>> >>> <target name="maven:install-jar"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="install-jar"/> >> > </target> >>> >>> >>> <target name="maven:fo"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/> >>> </target> >>> >>> >>> <target name="maven:javadocs"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/> >>> </target> >>> >>> >>> <target name="maven:validate-struts-war"> >>> <ant antfile="${maven.home}/plugins/struts/build.xml" >> target="validate-struts-war"/> >> 97d135 >> < <!-- maven:end --> >> 98a137,202 >> > <target name="maven:task-list"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" > target="task-list"/> > >> </target> >>> >>> >>> <target name="maven:ejb"> >>> <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ejb"/> >>> </target> >>> >>> >>> <target name="maven:docs"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/> >>> </target> >>> >>> >>> <target name="maven:clean"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/> >>> </target> >>> >>> >>> <target name="maven:dist-build"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="dist-build"/> >> > </target> >>> >>> >>> <target name="maven:metrics"> >>> <ant antfile="${maven.home}/plugins/metrics/build.xml" >> target="metrics"/> >> > </target> >>> >>> >>> <target name="maven:docs-quick"> >>> <ant antfile="${maven.home}/plugins/docs/build.xml" >> target="docs-quick"/> >> > </target> >>> >>> >>> <target name="maven:run-singletest"> >>> <ant antfile="${maven.home}/plugins/test/build.xml" >> target="run-singletest"/> >> > </target> >>> >>> >>> <target name="maven:check-source"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="check-source"/> >> > </target> >>> >>> >>> <target name="maven:generate-reactor"> >>> <ant antfile="${maven.home}/plugins/reactor/build.xml" >> target="generate-reactor"/> >> > </target> >>> >>> >>> <target name="maven:jar"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/> >>> </target> >>> >>> >>> <target name="maven:maven-update"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="maven-update"/> >> > </target> >>> >>> >>> <target name="maven:gump-descriptor"> >>> <ant antfile="${maven.home}/plugins/core/build.xml" >> target="gump-descriptor"/> >> > </target> >>> >>> >>> <!-- maven:end --> >> >> >> -- >> To unsubscribe, e-mail: > <mailto:[EMAIL PROTECTED]> > > For additional commands, e-mail: > <mailto:[EMAIL PROTECTED]> > > >> >> SPAM: ---- Start SpamAssassin results >> SPAM: -4.4 hits, 5 required; >> SPAM: * -4.4 -- 'In-Reply-To' line found >> SPAM: * -0.0 -- AWL: Auto-whitelist adjustment >> SPAM: >> SPAM: ---- End of SpamAssassin results > > -- > To unsubscribe, e-mail: > <mailto:[EMAIL PROTECTED]> > For additional commands, e-mail: > <mailto:[EMAIL PROTECTED]> > > > -- > To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> > For additional commands, e-mail: <mailto:[EMAIL PROTECTED]> > > > SPAM: ---- Start SpamAssassin results > SPAM: -4.4 hits, 5 required; > SPAM: * -4.4 -- 'In-Reply-To' line found > SPAM: * 0.0 -- AWL: Auto-whitelist adjustment > SPAM: > SPAM: ---- End of SpamAssassin results -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>