*** plugin.jelly	5 Feb 2004 01:34:11 -0000	1.4
--- plugin.jelly	1 Aug 2004 19:57:08 -0000
***************
*** 21,27 ****
          <sf:ftpBean
            site="${site}"
            destDir="${destDir}"
!           filesIterator="${files}"
            userEmail="${userEmail}"
          />
        </define:tag>
--- 21,27 ----
          <sf:ftpBean
            site="${site}"
            destDir="${destDir}"
!           filesIterator="${files.iterator()}"
            userEmail="${userEmail}"
          />
        </define:tag>
***************
*** 34,40 ****
  
        <define:tag name="release">
          <sf:releaseBean
!           filesIterator="${files}"
            sfGroupId="${sfGroupId}"
            sfUserName="${sfUserName}"
            sfPassword="${sfPassword}"
--- 34,40 ----
  
        <define:tag name="release">
          <sf:releaseBean
!           filesIterator="${files.iterator()}"
            sfGroupId="${sfGroupId}"
            sfUserName="${sfUserName}"
            sfPassword="${sfPassword}"
***************
*** 53,59 ****
--- 53,163 ----
        </define:tag>
        
    </define:taglib>
+ 
    
+   <!-- ================================================================== -->
+   <!-- sourceforge:changes                                          -->
+   <!-- ================================================================== -->
+ 
+   <goal name="sourceforge:changes"
+     description="Creates the CHANGES.txt file">
+ 
+     <!-- Generates the changes.txt file -->
+     
+     <util:available file="xdocs/changes.xml">
+       <x:parse var="root" xml="xdocs/changes.xml" />
+       <j:set var="version" value="${maven.sourceforge.project.version}" />
+       <ant:mkdir dir="${maven.dist.dir}" />
+     
+       <velocity:merge
+         name="${maven.dist.dir}/CHANGES.txt"
+         basedir="${plugin.resources}/templates"
+         template="changes.vm"
+       />
+     </util:available>
+     
+   </goal>
+   
+   <!-- ================================================================== -->
+   <!-- sourceforge:setfiles                                               -->
+   <!-- ================================================================== -->
+ 
+   <goal name="sourceforge:setfiles"
+    description="do the upload to the sourceforge ftp server">
+     
+     <fileScanner var="maven.sourceforge.distFileList">
+       <fileset dir="${maven.dist.dir}">
+         <patternset>
+           <include name="*"/>
+           <exclude name="CHANGES.txt"/>
+         </patternset>
+       </fileset>
+     </fileScanner>
+   </goal>
+ 
+   <!-- ================================================================== -->
+   <!-- sourceforge:upload                                           -->
+   <!-- ================================================================== -->
+ 
+   <goal name="sourceforge:upload"
+     description="do the upload to the sourceforge ftp server">
+     
+     <echo>Sending files to ftp://${maven.sourceforge.ftp.site}/${maven.sourceforge.ftp.incomingDir}</echo>     
+     <sf:ftp
+       site="${maven.sourceforge.ftp.site}"
+       destDir="${maven.sourceforge.ftp.incomingDir}"
+       files="${maven.sourceforge.distFileList}"
+       userEmail="${maven.sourceforge.userEmail}"
+     />
+    
+   </goal>
+ 
+   <!-- ================================================================== -->
+   <!-- sourceforge:release                                                -->
+   <!-- ================================================================== -->
+ 
+   <goal name="sourceforge:release"
+     description="Creating the release on the Sourceforge project">
+     
+     <echo>Creating the release on the Sourceforge project</echo>     
+     <sf:release
+       files="${maven.sourceforge.distFileList}"
+       sfGroupId="${maven.sourceforge.project.groupId}"
+       sfUserName="${maven.sourceforge.username}"
+       sfPassword="${maven.sourceforge.password}"
+       package="${maven.sourceforge.project.packageName}"
+       release="${maven.sourceforge.project.version}"
+       packageDescription="${maven.sourceforge.project.packageDescription}"
+       changeLogFile="${maven.dist.dir}/CHANGES.txt"
+       releaseNotesFile="${maven.sourceforge.project.releaseNotes}"
+       submitNewsItem="${maven.sourceforge.project.submitNewsItem}"
+       proxyHost="${maven.proxy.host}"
+       proxyPort="${maven.proxy.port}"
+       proxyUserName="${maven.proxy.username}"
+       proxyPassword="${maven.proxy.password}"
+       proxyNTDomain="${maven.proxy.ntdomain}"
+     />
+    
+   </goal>
+   
+ 
+   <!-- ================================================================== -->
+   <!-- sourceforge:deploy                                                 -->
+   <!-- ================================================================== -->
+ 
+   <goal name="sourceforge:deploy"
+     description="Deploy the distribution on Sourceforge">
+ 
+     <ant:property name="maven.sourceforge.username" value="${maven.username}"/> 
+     <maven:user-check user="${maven.sourceforge.username}"/>
+     <ant:property name="maven.sourceforge.userEmail" value="${maven.sourceforge.username}@users.sourceforge.net"/> 
+     <echo>Releasing package ${maven.sourceforge.project.packageName} version ${maven.sourceforge.project.version}</echo>
+     
+     <attainGoal name="sourceforge:changes"/>
+     <attainGoal name="sourceforge:setfiles"/>
+     <attainGoal name="sourceforge:upload"/>
+     <attainGoal name="sourceforge:release"/>
+   </goal>
    
    <!-- ================================================================== -->
    <!-- sourceforge:deploy-dist                                            -->
***************
*** 325,336 ****
    <goal name="sourceforge:info" 
      description="Prints diagnostic messages">
      
!     <echo>maven.build.dir             = ${maven.build.dir}</echo>      
!     <echo>maven.build.dest            = ${maven.build.dest}</echo>  
!     <echo>maven.sourceforge.ftp.site  = ${maven.sourceforge.ftp.site}</echo>
!     <echo>maven.sourceforge.ftp.incomingDir = ${maven.sourceforge.ftp.incomingDir}</echo>
!     <echo>maven.sourceforge.username  = ${maven.sourceforge.username}</echo>
! 
    </goal>
    
  </project>
--- 429,446 ----
    <goal name="sourceforge:info" 
      description="Prints diagnostic messages">
      
!     <echo>maven.build.dir                               = ${maven.build.dir}</echo>      
!     <echo>maven.build.dest                              = ${maven.build.dest}</echo>  
!     <echo>maven.dist.dir                                = ${maven.dist.dir}</echo>  
!     <echo>maven.sourceforge.ftp.site                    = ${maven.sourceforge.ftp.site}</echo>
!     <echo>maven.sourceforge.ftp.incomingDir             = ${maven.sourceforge.ftp.incomingDir}</echo>
!     <echo>maven.sourceforge.username                    = ${maven.sourceforge.username}</echo>
!     <echo>maven.sourceforge.password                    = ${maven.sourceforge.password}</echo>
!     <echo>maven.sourceforge.project.groupId             = ${maven.sourceforge.project.groupId}</echo>
!     <echo>maven.sourceforge.project.version             = ${maven.sourceforge.project.version}</echo>
!     <echo>maven.sourceforge.project.packageName         = ${maven.sourceforge.project.packageName}</echo>
!     <echo>maven.sourceforge.project.packageDescription  = ${maven.sourceforge.project.packageDescription}</echo>
!     <echo>maven.sourceforge.project.releaseNotes        = ${maven.sourceforge.project.releaseNotes}</echo>
    </goal>
    
  </project>

*** plugin.properties	13 May 2004 10:29:44 -0000	1.2
--- plugin.properties	1 Aug 2004 09:45:19 -0000
***************
*** 50,52 ****
--- 50,54 ----
  #
  maven.sourceforge.project.submitNewsItem = false
  
+ 
+ maven.dist.dir=${maven.build.dir}/distributions

*** src/main/net/sourceforge/mavenplugins/sourceforge/FTPBean.java	11 Jan 2004 03:56:36 -0000	1.2
--- src/main/net/sourceforge/mavenplugins/sourceforge/FTPBean.java	3 Aug 2004 10:26:32 -0000
***************
*** 134,139 ****
--- 134,140 ----
              
              for (Iterator i = _files.iterator(); i.hasNext();) {
                  File file = (File) i.next();
+                 System.out.println("copying file " + file.getName());
                  ftp.storeFile(
                          file.getName(),
                          new FileInputStream(file));

