You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2002/12/18 17:24:44 UTC

cvs commit: jakarta-turbine-maven/src/plugins-build/activity plugin.jelly

dion        2002/12/18 08:24:43

  Modified:    src/plugins-build/activity plugin.jelly
  Log:
  Ensure connection is specified before running activity report, as it defaults to the
  CVS implementation which fails when no connection is present
  
  Revision  Changes    Path
  1.15      +42 -40    jakarta-turbine-maven/src/plugins-build/activity/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/activity/plugin.jelly,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- plugin.jelly	17 Dec 2002 03:47:17 -0000	1.14
  +++ plugin.jelly	18 Dec 2002 16:24:43 -0000	1.15
  @@ -24,50 +24,52 @@
   
       <j:choose>
         <j:when test="${maven.mode.online}">
  -        <define:taglib uri="changelog">
  -          <define:jellybean
  -            name="changelog"
  -            className="org.apache.maven.changelog.ChangeLog"
  -            method="doExecute"
  -          />
  -        </define:taglib>
  -
  -        <mkdir dir="${maven.gen.docs}"/>
  +        <j:set var="_connection">${pom.repository.connection}</j:set>
  +        <j:if test="${!empty(_connection)}">  
  +          <define:taglib uri="changelog">
  +            <define:jellybean
  +              name="changelog"
  +              className="org.apache.maven.changelog.ChangeLog"
  +              method="doExecute"
  +            />
  +          </define:taglib>
   
  -        <changelog:changelog
  -          basedir="${basedir}"
  -          developers="${pom.developers}"
  -          factory="${maven.changelog.factory}"
  -          output="${maven.build.dir}/activity-log.xml"
  -          outputEncoding="${maven.docs.outputencoding}"
  -          range="${maven.activitylog.range}"
  -          repositoryConnection="${pom.repository.connection}"
  -        />
  +          <mkdir dir="${maven.gen.docs}"/>
   
  -        <!-- Transform the activity log into developer activity first -->
  -        <dvsl:dvsl
  -          extension=".xml"
  -          force="true"
  -          toolboxFile="${plugin.dir}/toolbox.props"
  -          style="${plugin.dir}/developer-activity.dvsl"
  -          in="${maven.build.dir}/activity-log.xml"
  -          out="${maven.gen.docs}/developer-activity-report.xml"
  -          outputEncoding="${maven.docs.outputencoding}"
  -          mavenProject="${pom}">
  -        </dvsl:dvsl>
  +          <changelog:changelog
  +            basedir="${basedir}"
  +            developers="${pom.developers}"
  +            factory="${maven.changelog.factory}"
  +            output="${maven.build.dir}/activity-log.xml"
  +            outputEncoding="${maven.docs.outputencoding}"
  +            range="${maven.activitylog.range}"
  +            repositoryConnection="${pom.repository.connection}"
  +          />
   
  -        <!-- Transform the activity log into file activity-->
  -        <dvsl:dvsl
  -          extension=".xml"
  -          force="true"
  -          toolboxFile="${plugin.dir}/toolbox.props"
  -          style="${plugin.dir}/file-activity.dvsl"
  -          in="${maven.build.dir}/activity-log.xml"
  -          out="${maven.gen.docs}/file-activity-report.xml"
  -          outputEncoding="${maven.docs.outputencoding}"
  -          mavenProject="${pom}">
  -        </dvsl:dvsl>
  +          <!-- Transform the activity log into developer activity first -->
  +          <dvsl:dvsl
  +            extension=".xml"
  +            force="true"
  +            toolboxFile="${plugin.dir}/toolbox.props"
  +            style="${plugin.dir}/developer-activity.dvsl"
  +            in="${maven.build.dir}/activity-log.xml"
  +            out="${maven.gen.docs}/developer-activity-report.xml"
  +            outputEncoding="${maven.docs.outputencoding}"
  +            mavenProject="${pom}">
  +          </dvsl:dvsl>
   
  +          <!-- Transform the activity log into file activity-->
  +          <dvsl:dvsl
  +            extension=".xml"
  +            force="true"
  +            toolboxFile="${plugin.dir}/toolbox.props"
  +            style="${plugin.dir}/file-activity.dvsl"
  +            in="${maven.build.dir}/activity-log.xml"
  +            out="${maven.gen.docs}/file-activity-report.xml"
  +            outputEncoding="${maven.docs.outputencoding}"
  +            mavenProject="${pom}">
  +          </dvsl:dvsl>
  +        </j:if>
         </j:when>
   
         <j:otherwise>