ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs AbstractJarSignerTask.java SignJar.java
Date Mon, 04 Apr 2005 13:46:24 GMT
bodewig     2005/04/04 06:46:24

  Modified:    src/main/org/apache/tools/ant/taskdefs
                        AbstractJarSignerTask.java SignJar.java
  Log:
  name hiding
  
  Revision  Changes    Path
  1.4       +5 -5      ant/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
  
  Index: AbstractJarSignerTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractJarSignerTask.java	24 Mar 2005 17:17:09 -0000	1.3
  +++ AbstractJarSignerTask.java	4 Apr 2005 13:46:24 -0000	1.4
  @@ -264,18 +264,18 @@
           if (null != keystore) {
               // is the keystore a file
               addValue(cmd,"-keystore");
  -            String location;
  +            String loc;
               File keystoreFile = getProject().resolveFile(keystore);
               if (keystoreFile.exists()) {
  -                location = keystoreFile.getPath();
  +                loc = keystoreFile.getPath();
               } else {
                   // must be a URL - just pass as is
  -                location = keystore;
  +                loc = keystore;
               }
  -            addValue(cmd,location);
  +            addValue(cmd, loc);
           }
           if (null != storetype) {
  -            addValue(cmd,"-storetype");
  +            addValue(cmd, "-storetype");
               addValue(cmd, storetype);
           }
       }
  
  
  
  1.53      +8 -8      ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- SignJar.java	23 Mar 2005 16:51:42 -0000	1.52
  +++ SignJar.java	4 Apr 2005 13:46:24 -0000	1.53
  @@ -362,11 +362,11 @@
               throws BuildException {
   
   
  -        File target = jarTarget;
  -        if (target == null) {
  -            target = jarSource;
  +        File targetFile = jarTarget;
  +        if (targetFile == null) {
  +            targetFile = jarSource;
           }
  -        if (isUpToDate(jarSource, target)) {
  +        if (isUpToDate(jarSource, targetFile)) {
               return;
           }
   
  @@ -384,9 +384,9 @@
   
           //DO NOT SET THE -signedjar OPTION if source==dest
           //unless you like fielding hotspot crash reports
  -        if (null != target && !jarSource.equals(target)) {
  +        if (null != targetFile && !jarSource.equals(targetFile)) {
               addValue(cmd, "-signedjar");
  -            addValue(cmd, target.getPath());
  +            addValue(cmd, targetFile.getPath());
           }
   
           if (internalsf) {
  @@ -409,14 +409,14 @@
           log("Signing JAR: " +
                   jarSource.getAbsolutePath()
                   +" to " +
  -                target.getAbsolutePath()
  +                targetFile.getAbsolutePath()
                   + " as " + alias);
   
           cmd.execute();
   
           // restore the lastModified attribute
           if (preserveLastModified) {
  -            target.setLastModified(lastModified);
  +            targetFile.setLastModified(lastModified);
           }
       }
   
  
  
  

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


Mime
View raw message