jvanzyl     2002/07/14 15:30:02

  Modified:    src/plugins-build/changelog plugin.jelly
               src/plugins-build/changelog/src/java/org/apache/maven/changelog
                        ChangeLog.java
  Log:
  o type coercion isn't the problem, it's something else. don't know what
    yet.
  
  Revision  Changes    Path
  1.5       +1 -1      jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plugin.jelly      14 Jul 2002 22:08:37 -0000      1.4
  +++ plugin.jelly      14 Jul 2002 22:30:02 -0000      1.5
  @@ -28,7 +28,7 @@
   
       <changelog:changelog
         projectDescriptor="project.xml"
  -      baseDir="${basedir}"
  +      basedir="${basedir}"
         output="${maven.gen.docs}/changelog.xml"
         range="${maven.changelog.range}"
         factory="${maven.changelog.factory}"
  
  
  
  1.3       +13 -8     
jakarta-turbine-maven/src/plugins-build/changelog/src/java/org/apache/maven/changelog/ChangeLog.java
  
  Index: ChangeLog.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/src/java/org/apache/maven/changelog/ChangeLog.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ChangeLog.java    14 Jul 2002 22:09:29 -0000      1.2
  +++ ChangeLog.java    14 Jul 2002 22:30:02 -0000      1.3
  @@ -97,14 +97,12 @@
       /**
        * Input dir. Working directory for running CVS executable
        */
  -    private String base;
  -    //private File base;
  +    private File base;
   
       /**
        * Output file for xml document
        */
  -    //private File output;
  -    private String output;
  +    private File output;
   
       /** change log entries parsed */
       private Collection entries;
  @@ -153,7 +151,7 @@
        * Set the base directory for the change log generator.
        * @param base the base directory
        */
  -    public void setBasedir(String base)
  +    public void setBasedir(File base)
       {
           this.base = base;
       }
  @@ -163,7 +161,7 @@
        *
        * @return the base directory
        */
  -    public String getBasedir()
  +    public File getBasedir()
       {
           return base;
       }
  @@ -172,7 +170,7 @@
        * Set the output file for the log.
        * @param output the output file
        */
  -    public void setOutput(String output)
  +    public void setOutput(File output)
       {
           this.output = output;
       }
  @@ -187,6 +185,8 @@
       public void doExecute() throws FileNotFoundException, IOException, 
           UnsupportedEncodingException
       {
  +        try
  +        {
           if (output == null)
           {
               throw new NullPointerException("output must be set");
  @@ -195,6 +195,11 @@
           generateEntries();
           replaceAuthorIdWithName();
           createDocument();
  +        }
  +        catch (Exception e)
  +        {
  +          e.printStackTrace();
  +        }          
       }
      
       /**
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to