dion 2003/03/30 14:59:57 Modified: xdocs/start anakia.xml src/plugins-build/changes/src/plugin-resources changes.jsl xdocs/development branches.xml xdocs faq.xml src/plugins-build/xdoc/src/plugin-resources/templates cvs-usage.xml xdocs/reference developer-guide.xml src/plugins-build/xdoc/xdocs goals.xml src/plugins-build/appserver/xdocs changes.xml src/plugins-build/checkstyle/src/plugin-resources checkstyle.jsl . build-bootstrap.xml Log: detab Revision Changes Path 1.6 +4 -4 maven/xdocs/start/anakia.xml Index: anakia.xml =================================================================== RCS file: /home/cvs/maven/xdocs/start/anakia.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- anakia.xml 18 Feb 2003 11:15:30 -0000 1.5 +++ anakia.xml 30 Mar 2003 22:59:56 -0000 1.6 @@ -70,10 +70,10 @@ </section> <section name="Anakia Extensions"> - <p> - See <a href="/site.html">Site Navigation</a> for more information about - Maven extensions to Anakia. - </p> + <p> + See <a href="/site.html">Site Navigation</a> for more information about + Maven extensions to Anakia. + </p> </section> </body> </document> 1.4 +3 -3 maven/src/plugins-build/changes/src/plugin-resources/changes.jsl Index: changes.jsl =================================================================== RCS file: /home/cvs/maven/src/plugins-build/changes/src/plugin-resources/changes.jsl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- changes.jsl 24 Mar 2003 11:04:14 -0000 1.3 +++ changes.jsl 30 Mar 2003 22:59:56 -0000 1.4 @@ -9,7 +9,7 @@ <jsl:template match="document"> <document> - <jsl:applyTemplates select="*"/> + <jsl:applyTemplates select="*"/> </document> </jsl:template> @@ -23,7 +23,7 @@ <j:set var="sectionName">Release <x:expr select="@version"/> - <x:expr select="@date"/></j:set> <section name="${sectionName}"> <table> - <tr><th style='width:50px'>Type</th><th>Changes</th><th style='width:70px'>By</th></tr> + <tr><th style='width:50px'>Type</th><th>Changes</th><th style='width:70px'>By</th></tr> <x:forEach var="action" select="action"> <j:set var="type"><x:expr select="@type"/></j:set> <j:set var="dev"><x:expr select="@dev"/></j:set> @@ -31,7 +31,7 @@ <td><img src="images/${type}.gif" alt="${type}"/></td> <td><x:expr select="string(.)"/></td> <td><a href="team-list.html#${dev}">${dev}</a></td> - </tr> + </tr> </x:forEach> </table> </section> 1.2 +4 -4 maven/xdocs/development/branches.xml Index: branches.xml =================================================================== RCS file: /home/cvs/maven/xdocs/development/branches.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- branches.xml 5 Aug 2002 18:16:31 -0000 1.1 +++ branches.xml 30 Mar 2003 22:59:56 -0000 1.2 @@ -43,11 +43,11 @@ <p> The naming scheme used for the branches is as following: The name of the branch is composed of a name describing the subject being worked on, followed by an - underscore and a two digit number used to distinguish multiple branches for the + underscore and a two digit number used to distinguish multiple branches for the same subject.<br/> Actual tag names are then:<br/> - <em>subject</em>_<em>number</em>-sprout for marking the revision of the trunk + <em>subject</em>_<em>number</em>-sprout for marking the revision of the trunk where the branch diverged <br/> <em>subject</em>_<em>number</em>-branch for the branch itself <br/> <em>subject</em>_<em>number</em>-before-merge for marking the last revision of @@ -62,9 +62,9 @@ between developers, maintaining the branches' TODO and timely merging the changes into the trunk (closing the branch). The shorter a branch stays outside the trunk, the better, because that decreases the number of conflict that will arise - while merging back. Developers that are working on the trunk of the CVS should + while merging back. Developers that are working on the trunk of the CVS should not make modifications to the code named in 'affected sources' to prevent - merging conflicts. Instead, they should direct all requests / patches to the + merging conflicts. Instead, they should direct all requests / patches to the coordinating person. Developers wishing to join the development of the branching code, should contact the coordinating person. </p> 1.30 +5 -5 maven/xdocs/faq.xml Index: faq.xml =================================================================== RCS file: /home/cvs/maven/xdocs/faq.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- faq.xml 27 Mar 2003 11:23:21 -0000 1.29 +++ faq.xml 30 Mar 2003 22:59:56 -0000 1.30 @@ -173,7 +173,7 @@ </dd> <dt> <a name="changelog-broken"> - I have problems generating the changelog report? + I have problems generating the changelog report? </a> </dt> <dd> @@ -182,8 +182,8 @@ final output is blank. </p> <p> - This is typically caused by the cvs command not running correctly. - The first port of call is to check maven.log, search the file for "SCM" + This is typically caused by the cvs command not running correctly. + The first port of call is to check maven.log, search the file for "SCM" </p> <p> <source> @@ -198,8 +198,8 @@ </source> </p> <p> - Try running the command that you find in the log file manually. The results typically - speak for themselves. + Try running the command that you find in the log file manually. The results typically + speak for themselves. </p> </dd> <dt> 1.4 +5 -5 maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml Index: cvs-usage.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cvs-usage.xml 26 Mar 2003 20:45:14 -0000 1.3 +++ cvs-usage.xml 30 Mar 2003 22:59:57 -0000 1.4 @@ -8,16 +8,16 @@ </properties> <body> - #set ($repository = $project.repository) - - #if (!$repository) + #set ($repository = $project.repository) + + #if (!$repository) <section name="Repository"> <p> No SCM repository is defined. </p> </section> - #else - + #else + #set ($conn = $repository.cvsRoot) #set ($module = $repository.cvsModule) #set ($url = $escape.getText($project.repository.url)) 1.7 +12 -12 maven/xdocs/reference/developer-guide.xml Index: developer-guide.xml =================================================================== RCS file: /home/cvs/maven/xdocs/reference/developer-guide.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- developer-guide.xml 11 Mar 2003 10:07:23 -0000 1.6 +++ developer-guide.xml 30 Mar 2003 22:59:57 -0000 1.7 @@ -144,10 +144,10 @@ to the user's project. </p> <p> - The second part of the plugin protocol is the specification of - a deregistration goal called <code>maven-xyz-plugin:report</code>. - This goal is optional, but should be included to allow users to - add / remove the report from their site. + The second part of the plugin protocol is the specification of + a deregistration goal called <code>maven-xyz-plugin:report</code>. + This goal is optional, but should be included to allow users to + add / remove the report from their site. </p> <source><![CDATA[ <goal name="maven-javadoc-plugin:deregister"> @@ -181,18 +181,18 @@ </subsection> <subsection name="Programmatic Report Control"> - <p>If you wish to use the default reports but remove one or add one, the - preferred method is to use a postGoal for xdoc:register-reports - </p> - + <p>If you wish to use the default reports but remove one or add one, the + preferred method is to use a postGoal for xdoc:register-reports + </p> + <source><![CDATA[ <postGoal name="xdoc:register-reports"> - <attainGoal name="maven-changelog-plugin:deregister"/> - <attainGoal name="maven-myown-plugin:register"/> + <attainGoal name="maven-changelog-plugin:deregister"/> + <attainGoal name="maven-myown-plugin:register"/> </postGoal> ]]></source> - - + + </subsection> </section> </body> 1.2 +24 -24 maven/src/plugins-build/xdoc/xdocs/goals.xml Index: goals.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/xdoc/xdocs/goals.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- goals.xml 24 Jan 2003 03:45:03 -0000 1.1 +++ goals.xml 30 Mar 2003 22:59:57 -0000 1.2 @@ -9,36 +9,36 @@ <body> <section name="Goals"> <table> - <tr><th>Goal</th><th>Description</th></tr> - - <a name="xdoc" /> - <tr> - <td>xdoc</td> - <td> - The default goal. This goal simply executes the - <a href="#xdoc:generate-from-pom">xdoc:generate-from-pom</a> - and <a href="#xdoc:transform">xdoc:transform</a> goals - </td> - </tr> - - <a name="xdoc:generate-from-pom" /> - <tr> + <tr><th>Goal</th><th>Description</th></tr> + + <a name="xdoc" /> + <tr> + <td>xdoc</td> + <td> + The default goal. This goal simply executes the + <a href="#xdoc:generate-from-pom">xdoc:generate-from-pom</a> + and <a href="#xdoc:transform">xdoc:transform</a> goals + </td> + </tr> + + <a name="xdoc:generate-from-pom" /> + <tr> <td>xdoc:generate-from-pom</td> <td> Generate a set of reports from your <code>project.xml</code> file. This includes the dependency, mailing list, project info, project reports and team list pages </td> - </tr> - - <a name="init-dvsl-tag" /> - <tr> - <td>init-dvsl-tag</td> - <td> - This goal defines the <code>DVSL</code> tag library for generating - documentation. A single tag <code>dvsl:dvsl</code> is defined. - </td> - </tr> + </tr> + + <a name="init-dvsl-tag" /> + <tr> + <td>init-dvsl-tag</td> + <td> + This goal defines the <code>DVSL</code> tag library for generating + documentation. A single tag <code>dvsl:dvsl</code> is defined. + </td> + </tr> </table> </section> </body> 1.2 +1 -1 maven/src/plugins-build/appserver/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/appserver/xdocs/changes.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- changes.xml 26 Jan 2003 06:53:12 -0000 1.1 +++ changes.xml 30 Mar 2003 22:59:57 -0000 1.2 @@ -12,7 +12,7 @@ b5 </action> <action dev="dion" type="fix"> - Fix for jars not being included in an EAR file + Fix for jars not being included in an EAR file </action> <action dev="dion" type="add"> Added the new <a href="changes-report.html">changes report</a>. 1.6 +1 -1 maven/src/plugins-build/checkstyle/src/plugin-resources/checkstyle.jsl Index: checkstyle.jsl =================================================================== RCS file: /home/cvs/maven/src/plugins-build/checkstyle/src/plugin-resources/checkstyle.jsl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- checkstyle.jsl 6 Mar 2003 10:34:17 -0000 1.5 +++ checkstyle.jsl 30 Mar 2003 22:59:57 -0000 1.6 @@ -81,7 +81,7 @@ <j:if test="${errorCount != 0}"> <j:set var="name" value="${file.attribute('name').getValue()}"/> <j:set var="name" value="${name.substring(mavenTool.toInteger(srcDirLength.toString()))}"/> - <util:replace var="name" value="${name}" oldChar="\\" newChar="/"/> + <util:replace var="name" value="${name}" oldChar="\\" newChar="/"/> <subsection name="${name}"> <table> 1.191 +1 -1 maven/build-bootstrap.xml Index: build-bootstrap.xml =================================================================== RCS file: /home/cvs/maven/build-bootstrap.xml,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- build-bootstrap.xml 26 Mar 2003 16:25:02 -0000 1.190 +++ build-bootstrap.xml 30 Mar 2003 22:59:57 -0000 1.191 @@ -212,7 +212,7 @@ </condition> <property name="maven.command" value="${maven.home}/bin/${maven.script}"/> - + <echo> +------------------------------------------------------------------+ | |
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]