kschrader    02/03/26 11:31:17

  Modified:    src/java/org/apache/maven UpdateResources.java
               xdocs    musings.xml
  Log:
  Fixing Maven so that it only gives you a non-distributable warning if the
  file doesn't already exist in your lib.repo.
  
  Revision  Changes    Path
  1.9       +13 -9     
jakarta-turbine-maven/src/java/org/apache/maven/UpdateResources.java
  
  Index: UpdateResources.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/UpdateResources.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UpdateResources.java      16 Mar 2002 17:22:09 -0000      1.8
  +++ UpdateResources.java      26 Mar 2002 19:31:17 -0000      1.9
  @@ -169,15 +169,19 @@
               
               if (nonDistMap.containsKey(file))
               {
  -                
warnings.append("-------------------------------------------------\n");
  -                warnings.append("W A R N I N G\n");
  -                
warnings.append("------------------------------------------------\n");
  -                warnings.append("The following JAR must be downloaded manually:\n");
  -                warnings.append(file + "\n");
  -                warnings.append("\n");
  -                warnings.append("You can find the JAR here:\n");
  -                warnings.append(nonDistMap.get(file) + "\n");
  -                warnings.append("\n");
  +                if (!destinationFile.exists())
  +                {
  +                    
warnings.append("-------------------------------------------------\n");
  +                    warnings.append("W A R N I N G\n");
  +                    
warnings.append("------------------------------------------------\n");
  +                    warnings.append("The following JAR must be downloaded 
manually:\n");
  +                    warnings.append(file + "\n");
  +                    warnings.append("\n");
  +                    warnings.append("You can find the JAR here:\n");
  +                    warnings.append(nonDistMap.get(file) + "\n");
  +                    warnings.append("\n");
  +                    continue;
  +                }
                   continue;
               }
               
  
  
  
  1.23      +0 -4      jakarta-turbine-maven/xdocs/musings.xml
  
  Index: musings.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/xdocs/musings.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- musings.xml       26 Mar 2002 13:36:28 -0000      1.22
  +++ musings.xml       26 Mar 2002 19:31:17 -0000      1.23
  @@ -64,10 +64,6 @@
             eventually.
          </li>
          <li>
  -         Before warning users about jar that can't be distributed, check to make
  -         sure they don't already have it. (warner's idea)
  -       </li>
  -       <li>
            Figure the scenerio where the project must generate sources before
            building. We have some crappy deps in the fulcrum build that need
            to be cleaned up. The dependencies between the targets need to
  
  
  

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

Reply via email to