jvanzyl     2002/07/05 09:39:20

  Modified:    src/java/org/apache/maven/util HttpUtils.java
               src/plugins/core plugin.jelly
               src/plugins/xdoc plugin.jelly
  Log:
  
  
  Revision  Changes    Path
  1.4       +4 -4      
jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java
  
  Index: HttpUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/util/HttpUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HttpUtils.java    27 May 2002 13:49:42 -0000      1.3
  +++ HttpUtils.java    5 Jul 2002 16:39:20 -0000       1.4
  @@ -178,10 +178,7 @@
               // if-modified-since behaviour - we just check the date of the 
               // content and skip the write if it is not newer. 
               // Some protocols (FTP) dont include dates, of course.
  -
  -            FileOutputStream fos = new FileOutputStream(destinationFile);
  -            logx("Writing " + destinationFile);
  -
  +         
               InputStream is = null;
               for (int i = 0; i < 3; i++)
               {
  @@ -205,6 +202,9 @@
                   throw new Exception(
                       "Can't get " + file + " to " + destinationFile);
               }
  +
  +            FileOutputStream fos = new FileOutputStream(destinationFile);
  +            logx("Writing " + destinationFile);
   
               byte[] buffer = new byte[100 * 1024];
               int length;
  
  
  
  1.13      +0 -1      jakarta-turbine-maven/src/plugins/core/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/core/plugin.jelly,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- plugin.jelly      5 Jul 2002 01:37:52 -0000       1.12
  +++ plugin.jelly      5 Jul 2002 16:39:20 -0000       1.13
  @@ -171,6 +171,5 @@
         <attainGoal name="xdocs:transform"/>
     
     </goal>
  -  
   
   </project>
  
  
  
  1.9       +2 -2      jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/xdoc/plugin.jelly,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- plugin.jelly      5 Jul 2002 14:24:10 -0000       1.8
  +++ plugin.jelly      5 Jul 2002 16:39:20 -0000       1.9
  @@ -19,7 +19,7 @@
       <create-xdocs
         controlTemplate="Control.vm"
         outputDirectory="${maven.gen.docs}"
  -      templatePath="${maven.home}/templates/xdocs"
  +      templatePath="${maven.home}/plugins/xdoc/templates"
         outputFile="xdocs.report"
         projectDescriptor="project.xml"
       />
  @@ -118,7 +118,7 @@
   
       <!-- Copy maven supplied stylesheets.  -->
       <copy todir="${maven.docs.dest}/style" overwrite="yes" filtering="yes">
  -      <fileset dir="${maven.home}/stylesheets">
  +      <fileset dir="${maven.home}/plugins/xdoc/css">
           <include name="**/*.css"/>
         </fileset>
         <filterset>
  
  
  

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

Reply via email to