[jboss-cvs] jbossbuild/src/main/org/jboss/ant/types/build ...

[Paul Gier]

  User: pgier   
  Date: 08/05/17 17:18:13

  Modified:    src/main/org/jboss/ant/types/build    Build.java
                        Component.java Artifact.java
  Log:
  [JBBUILD-432] Apply patch to fix compatibility with ant 1.7.
  Submitted By: Torsten Werner
  
  Revision  Changes    Path
  1.16      +2 -2      jbossbuild/src/main/org/jboss/ant/types/build/Build.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Build.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossbuild/src/main/org/jboss/ant/types/build/Build.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Build.java	16 Jun 2005 19:25:40 -0000	1.15
  +++ Build.java	17 May 2008 21:18:13 -0000	1.16
  @@ -35,7 +35,7 @@
    * A build.
    * 
    * @author <a href="adrian at jboss.com">Adrian Brock </a>
  - * @version $Revision: 1.15 $
  + * @version $Revision: 1.16 $
    */
   public class Build extends Source
   {
  @@ -413,7 +413,7 @@
       * 
       * @return the location
       */
  -   public URL getLocation() throws MalformedURLException
  +   public URL getLocationURL() throws MalformedURLException
      {
         if (location == null)
            return null;
  
  
  
  1.18      +3 -3      jbossbuild/src/main/org/jboss/ant/types/build/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossbuild/src/main/org/jboss/ant/types/build/Component.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- Component.java	12 Sep 2005 13:42:05 -0000	1.17
  +++ Component.java	17 May 2008 21:18:13 -0000	1.18
  @@ -30,7 +30,7 @@
    * A component.
    * 
    * @author <a href="adrian at jboss.com">Adrian Brock </a>
  - * @version $Revision: 1.17 $
  + * @version $Revision: 1.18 $
    */
   public class Component extends Source
   {
  @@ -535,7 +535,7 @@
       * 
       * @return the location
       */
  -   public URL getLocation() throws MalformedURLException
  +   public URL getLocationURL() throws MalformedURLException
      {
         URL locationURL = null;
         if (location != null)
  @@ -544,7 +544,7 @@
         }
         else
         {
  -         locationURL = build.getLocation();
  +         locationURL = build.getLocationURL();
         }
   
         URL componentLocation = FileUtil.resolve(locationURL, getId());
  
  
  
  1.13      +3 -3      jbossbuild/src/main/org/jboss/ant/types/build/Artifact.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Artifact.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossbuild/src/main/org/jboss/ant/types/build/Artifact.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Artifact.java	12 Sep 2005 13:41:28 -0000	1.12
  +++ Artifact.java	17 May 2008 21:18:13 -0000	1.13
  @@ -23,7 +23,7 @@
    * An artifact.
    * 
    * @author <a href="adrian at jboss.com">Adrian Brock </a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   public class Artifact extends Source
   {
  @@ -83,11 +83,11 @@
       * 
       * @return the location
       */
  -   public URL getLocation() throws MalformedURLException
  +   public URL getLocationURL() throws MalformedURLException
      {
         if (location == null)
         {
  -         URL componentLocation = component.getLocation();
  +         URL componentLocation = component.getLocationURL();
            String path = getOutputPath();
            if (path != null)
               return new URL(componentLocation + "/" + path + "/" + getFilename());