Browse Source

NAMELEN constant moved to TarEntry

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270926 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
3494ca7bb3
2 changed files with 12 additions and 20 deletions
  1. +6
    -10
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
  2. +6
    -10
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java

+ 6
- 10
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java View File

@@ -13,16 +13,12 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import org.apache.myrmidon.api.TaskException;



import org.apache.tools.ant.util.mappers.MergingMapper;
import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.aut.tar.TarConstants;
import org.apache.aut.tar.TarEntry; import org.apache.aut.tar.TarEntry;
import org.apache.aut.tar.TarOutputStream; import org.apache.aut.tar.TarOutputStream;
import org.apache.avalon.excalibur.io.IOUtil; import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.util.mappers.MergingMapper;


/** /**
* Creates a TAR archive. * Creates a TAR archive.
@@ -249,7 +245,7 @@ public class Tar
path += "/"; path += "/";
} }


if( path.length() >= TarConstants.NAMELEN )
if( path.length() >= TarEntry.NAMELEN )
{ {
if( longFileMode.isOmitMode() ) if( longFileMode.isOmitMode() )
{ {
@@ -260,7 +256,7 @@ public class Tar
else if( longFileMode.isWarnMode() ) else if( longFileMode.isWarnMode() )
{ {
final String message = "Entry: " + path + " longer than " + final String message = "Entry: " + path + " longer than " +
TarConstants.NAMELEN + " characters.";
TarEntry.NAMELEN + " characters.";
getLogger().warn( message ); getLogger().warn( message );
if( !longWarningGiven ) if( !longWarningGiven )
{ {
@@ -273,7 +269,7 @@ public class Tar
else if( longFileMode.isFailMode() ) else if( longFileMode.isFailMode() )
{ {
final String message = "Entry: " + path + " longer than " + final String message = "Entry: " + path + " longer than " +
TarConstants.NAMELEN + "characters.";
TarEntry.NAMELEN + "characters.";
throw new TaskException( message ); throw new TaskException( message );
} }
} }


+ 6
- 10
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java View File

@@ -13,16 +13,12 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import org.apache.myrmidon.api.TaskException;



import org.apache.tools.ant.util.mappers.MergingMapper;
import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.aut.tar.TarConstants;
import org.apache.aut.tar.TarEntry; import org.apache.aut.tar.TarEntry;
import org.apache.aut.tar.TarOutputStream; import org.apache.aut.tar.TarOutputStream;
import org.apache.avalon.excalibur.io.IOUtil; import org.apache.avalon.excalibur.io.IOUtil;
import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.types.SourceFileScanner;
import org.apache.tools.ant.util.mappers.MergingMapper;


/** /**
* Creates a TAR archive. * Creates a TAR archive.
@@ -249,7 +245,7 @@ public class Tar
path += "/"; path += "/";
} }


if( path.length() >= TarConstants.NAMELEN )
if( path.length() >= TarEntry.NAMELEN )
{ {
if( longFileMode.isOmitMode() ) if( longFileMode.isOmitMode() )
{ {
@@ -260,7 +256,7 @@ public class Tar
else if( longFileMode.isWarnMode() ) else if( longFileMode.isWarnMode() )
{ {
final String message = "Entry: " + path + " longer than " + final String message = "Entry: " + path + " longer than " +
TarConstants.NAMELEN + " characters.";
TarEntry.NAMELEN + " characters.";
getLogger().warn( message ); getLogger().warn( message );
if( !longWarningGiven ) if( !longWarningGiven )
{ {
@@ -273,7 +269,7 @@ public class Tar
else if( longFileMode.isFailMode() ) else if( longFileMode.isFailMode() )
{ {
final String message = "Entry: " + path + " longer than " + final String message = "Entry: " + path + " longer than " +
TarConstants.NAMELEN + "characters.";
TarEntry.NAMELEN + "characters.";
throw new TaskException( message ); throw new TaskException( message );
} }
} }


Loading…
Cancel
Save