ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types XMLCatalog.java
Date Mon, 13 Jan 2003 16:12:38 GMT
bodewig     2003/01/13 08:12:37

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Javadoc.java
               src/main/org/apache/tools/ant/taskdefs/compilers Tag:
                        ANT_15_BRANCH DefaultCompilerAdapter.java
               src/main/org/apache/tools/ant/taskdefs/optional Tag:
                        ANT_15_BRANCH Javah.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
                        ANT_15_BRANCH IPlanetEjbcTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
                        Tag: ANT_15_BRANCH JasperC.java
               src/main/org/apache/tools/ant/taskdefs/rmic Tag:
                        ANT_15_BRANCH DefaultRmicAdapter.java
               src/main/org/apache/tools/ant/types Tag: ANT_15_BRANCH
                        XMLCatalog.java
  Log:
  merge fixes for bug 15014 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.108 +2 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.107
  retrieving revision 1.263.2.108
  diff -u -r1.263.2.107 -r1.263.2.108
  --- WHATSNEW	13 Jan 2003 12:39:17 -0000	1.263.2.107
  +++ WHATSNEW	13 Jan 2003 16:12:35 -0000	1.263.2.108
  @@ -54,6 +54,8 @@
   * The <get> task can now be compiled (and Ant thus bootstrapped) using
     Kaffee.
   
  +* build.sysclasspath will now be honored by more tasks.
  +
   Other changes:
   --------------
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.96.2.9  +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.96.2.8
  retrieving revision 1.96.2.9
  diff -u -r1.96.2.8 -r1.96.2.9
  --- Javadoc.java	8 Nov 2002 16:11:11 -0000	1.96.2.8
  +++ Javadoc.java	13 Jan 2003 16:12:36 -0000	1.96.2.9
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -1559,7 +1559,7 @@
           }
   
           if (classpath == null) {
  -            classpath = Path.systemClasspath;
  +            classpath = (new Path(getProject())).concatSystemClasspath("last");
           } else {
               classpath = classpath.concatSystemClasspath("ignore");
           }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.28.2.5  +9 -13     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.28.2.4
  retrieving revision 1.28.2.5
  diff -u -r1.28.2.4 -r1.28.2.5
  --- DefaultCompilerAdapter.java	19 Jun 2002 15:46:09 -0000	1.28.2.4
  +++ DefaultCompilerAdapter.java	13 Jan 2003 16:12:36 -0000	1.28.2.5
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -168,20 +168,16 @@
           }
   
           // Combine the build classpath with the system classpath, in an
  -        // order determined by the value of build.classpath
  +        // order determined by the value of build.sysclasspath
   
  -        if (compileClasspath == null) {
  -            if (includeAntRuntime) {
  -                classpath.addExisting(Path.systemClasspath);
  -            }
  +        Path cp = compileClasspath;
  +        if (cp == null) {
  +            cp = new Path(project);
  +        }
  +        if (includeAntRuntime) {
  +            classpath.addExisting(cp.concatSystemClasspath("last"));
           } else {
  -            if (includeAntRuntime) {
  -                classpath.addExisting(compileClasspath
  -                                      .concatSystemClasspath("last"));
  -            } else {
  -                classpath.addExisting(compileClasspath
  -                                      .concatSystemClasspath("ignore"));
  -            }
  +            classpath.addExisting(cp.concatSystemClasspath("ignore"));
           }
   
           if (includeJavaRuntime) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.15.2.2  +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  
  Index: Javah.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
  retrieving revision 1.15.2.1
  retrieving revision 1.15.2.2
  diff -u -r1.15.2.1 -r1.15.2.2
  --- Javah.java	22 Jun 2002 23:40:21 -0000	1.15.2.1
  +++ Javah.java	13 Jan 2003 16:12:36 -0000	1.15.2.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -302,7 +302,9 @@
           }
   
           if (classpath == null) {
  -            classpath = Path.systemClasspath;
  +            classpath = (new Path(getProject())).concatSystemClasspath("last");
  +        } else {
  +            classpath = classpath.concatSystemClasspath("ignore");
           }
   
           String compiler = project.getProperty("build.compiler");
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.2   +6 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
  
  Index: IPlanetEjbcTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- IPlanetEjbcTask.java	22 Jun 2002 23:40:22 -0000	1.6.2.1
  +++ IPlanetEjbcTask.java	13 Jan 2003 16:12:36 -0000	1.6.2.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -344,10 +344,13 @@
        * @return Path The classpath to be used for EJBc.
        */
       private Path getClasspath() {
  +        Path cp = null;
           if (classpath == null) {
  -            classpath = Path.systemClasspath;
  +            cp = (new Path(getProject())).concatSystemClasspath("last");
  +        } else {
  +            cp = classpath.concatSystemClasspath("ignore");
           }
   
  -        return classpath;
  +        return cp;
       }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.3   +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
  
  Index: JasperC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- JasperC.java	13 Aug 2002 20:06:49 -0000	1.8.2.2
  +++ JasperC.java	13 Jan 2003 16:12:37 -0000	1.8.2.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -106,7 +106,8 @@
               if (getJspc().getClasspath() != null) {
                   getProject().log("using user supplied classpath: "+getJspc().getClasspath(),
                       Project.MSG_DEBUG);
  -                java.setClasspath(getJspc().getClasspath());
  +                java.setClasspath(getJspc().getClasspath()
  +                                  .concatSystemClasspath("ignore"));
               } else {
                   Path classpath=new Path(getProject());
                   classpath=classpath.concatSystemClasspath("only");
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.2  +9 -12     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
  
  Index: DefaultRmicAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
  retrieving revision 1.20.2.1
  retrieving revision 1.20.2.2
  diff -u -r1.20.2.1 -r1.20.2.2
  --- DefaultRmicAdapter.java	20 May 2002 20:28:36 -0000	1.20.2.1
  +++ DefaultRmicAdapter.java	13 Jan 2003 16:12:37 -0000	1.20.2.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -146,18 +146,15 @@
   
           // Combine the build classpath with the system classpath, in an 
           // order determined by the value of build.sysclasspath
  -        if (attributes.getClasspath() == null) {
  -            if (attributes.getIncludeantruntime()) {
  -                classpath.addExisting(Path.systemClasspath);
  -            }
  +        
  +        Path cp = attributes.getClasspath();
  +        if (cp == null) {
  +            cp = new Path(attributes.getProject());
  +        }
  +        if (attributes.getIncludeantruntime()) {
  +            classpath.addExisting(cp.concatSystemClasspath("last"));
           } else {
  -            if (attributes.getIncludeantruntime()) {
  -                classpath.addExisting(attributes.getClasspath()
  -                                      .concatSystemClasspath("last"));
  -            } else {
  -                classpath.addExisting(attributes.getClasspath()
  -                                      .concatSystemClasspath("ignore"));
  -            }
  +            classpath.addExisting(cp.concatSystemClasspath("ignore"));
           }
   
           if (attributes.getIncludejavaruntime()) {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.7   +7 -5      jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java
  
  Index: XMLCatalog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/XMLCatalog.java,v
  retrieving revision 1.9.2.6
  retrieving revision 1.9.2.7
  diff -u -r1.9.2.6 -r1.9.2.7
  --- XMLCatalog.java	29 Jun 2002 08:17:48 -0000	1.9.2.6
  +++ XMLCatalog.java	13 Jan 2003 16:12:37 -0000	1.9.2.7
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -536,11 +536,13 @@
           InputSource source = null;
   
           AntClassLoader loader = null;
  -        if (classpath != null) {
  -            loader = new AntClassLoader(project, classpath);
  +        Path cp = classpath;
  +        if (cp != null) {
  +            cp = classpath.concatSystemClasspath("ignore");
           } else {
  -            loader = new AntClassLoader(project, Path.systemClasspath);
  +            cp = (new Path(getProject())).concatSystemClasspath("last");
           }
  +        loader = new AntClassLoader(getProject(), cp);
   
           //
           // for classpath lookup we ignore the base directory
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message