Skip to content

Commit 7ae0f5a

Browse files
krosenvoldkrosenvold
committed
[PLXCOMP-234] Remove useless options
Patch by James Henderson, rebased/realigned to current master
1 parent abefa1f commit 7ae0f5a

File tree

2 files changed

+21
-123
lines changed

2 files changed

+21
-123
lines changed

‎src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java‎

Lines changed: 1 addition & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -76,41 +76,8 @@ public TarOptions getOptions()
7676
public void setOptions( TarOptions options )
7777
{
7878
this.options = options;
79-
80-
// FIXME: do these options have precedence over
81-
// setDefaultFileMode / setDefaultDirMode
82-
// or the other way around? Assuming these
83-
// take precedende since they're more specific.
84-
// Better refactor this when usage is known.
85-
86-
setDefaultFileMode( options.getMode() );
87-
88-
setDefaultDirectoryMode( options.getMode() );
8979
}
9080

91-
// /**
92-
// * Override AbstractArchiver.setDefaultFileMode to
93-
// * update TarOptions.
94-
// */
95-
// public void setDefaultFileMode( int mode )
96-
// {
97-
// super.setDefaultFileMode( mode );
98-
//
99-
// options.setMode( mode );
100-
// }
101-
//
102-
// /**
103-
// * Override AbstractArchiver.setDefaultDirectoryMode to
104-
// * update TarOptions.
105-
// */
106-
// public void setDefaultDirectoryMode( int mode )
107-
// {
108-
// super.setDefaultDirectoryMode( mode );
109-
//
110-
// options.setDirMode( mode );
111-
// }
112-
//
113-
//
11481
/**
11582
* Set how to handle long files, those with a path>100 chars.
11683
* Optional, default=warn.
@@ -383,16 +350,6 @@ else if ( longFileMode.isFailMode() )
383350
*/
384351
public class TarOptions
385352
{
386-
/**
387-
* @deprecated
388-
*/
389-
private int fileMode = UnixStat.FILE_FLAG | UnixStat.DEFAULT_FILE_PERM;
390-
391-
/**
392-
* @deprecated
393-
*/
394-
private int dirMode = UnixStat.DIR_FLAG | UnixStat.DEFAULT_DIR_PERM;
395-
396353
private String userName = "";
397354

398355
private String groupName = "";
@@ -403,70 +360,6 @@ public class TarOptions
403360

404361
private boolean preserveLeadingSlashes = false;
405362

406-
/**
407-
* A 3 digit octal string, specify the user, group and
408-
* other modes in the standard Unix fashion;
409-
* optional, default=0644
410-
*
411-
* @param octalString a 3 digit octal string.
412-
* @deprecated use AbstractArchiver.setDefaultFileMode(int)
413-
*/
414-
public void setMode( String octalString )
415-
{
416-
setMode( Integer.parseInt( octalString, 8 ) );
417-
}
418-
419-
/**
420-
* @param mode unix file mode
421-
* @deprecated use AbstractArchiver.setDefaultFileMode(int)
422-
*/
423-
public void setMode( int mode )
424-
{
425-
this.fileMode = UnixStat.FILE_FLAG | ( mode & UnixStat.PERM_MASK );
426-
}
427-
428-
/**
429-
* @return the current mode.
430-
* @deprecated use AbstractArchiver.getDefaultFileMode()
431-
*/
432-
public int getMode()
433-
{
434-
return fileMode;
435-
}
436-
437-
/**
438-
* A 3 digit octal string, specify the user, group and
439-
* other modes in the standard Unix fashion;
440-
* optional, default=0755
441-
*
442-
* @param octalString a 3 digit octal string.
443-
* @since Ant 1.6
444-
* @deprecated use AbstractArchiver.setDefaultDirectoryMode(int)
445-
*/
446-
public void setDirMode( String octalString )
447-
{
448-
setDirMode( Integer.parseInt( octalString, 8 ) );
449-
}
450-
451-
/**
452-
* @param mode unix directory mode
453-
* @deprecated use AbstractArchiver.setDefaultDirectoryMode(int)
454-
*/
455-
public void setDirMode( int mode )
456-
{
457-
this.dirMode = UnixStat.DIR_FLAG | ( mode & UnixStat.PERM_MASK );
458-
}
459-
460-
/**
461-
* @return the current directory mode
462-
* @since Ant 1.6
463-
* @deprecated use AbstractArchiver.getDefaultDirectoryMode()
464-
*/
465-
public int getDirMode()
466-
{
467-
return dirMode;
468-
}
469-
470363
/**
471364
* The username for the tar entry
472365
* This is not the same as the UID.
@@ -569,7 +462,7 @@ public void setPreserveLeadingSlashes( boolean preserveLeadingSlashes )
569462
*/
570463
public static enum TarCompressionMethod
571464
{
572-
none, gzip, bzip2;
465+
none, gzip, bzip2
573466

574467
}
575468

‎src/test/java/org/codehaus/plexus/archiver/tar/TarArchiverTest.java‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -269,20 +269,28 @@ private void writeFile( File dir, String fname, int mode )
269269
public void testCreateArchive()
270270
throws Exception
271271
{
272-
TarArchiver archiver = getPosixTarArchiver();
272+
createArchive(0500, new int[] {0400, 0640, 0664});
273+
createArchive(0500, new int[] {0400, 0640, 0664});
274+
}
275+
276+
public void createArchive(final int directoryMode, final int fileModes[])
277+
throws Exception
278+
{
279+
int defaultFileMode = fileModes[0];
280+
int oneFileMode = fileModes[1];
281+
int twoFileMode = fileModes[2];
282+
283+
TarArchiver archiver = getPosixTarArchiver();
273284

274-
archiver.setDirectoryMode( 0500 );
275-
archiver.getOptions().setDirMode( 0500 );
285+
archiver.setDirectoryMode( directoryMode );
276286

277-
archiver.setFileMode( 0400 );
278-
archiver.getOptions().setMode( 0400 );
287+
archiver.setFileMode( defaultFileMode );
279288

280289
archiver.addDirectory( getTestFile( "src" ) );
281-
archiver.setFileMode( 0640 );
282-
archiver.getOptions().setMode( 0640 );
290+
archiver.setFileMode( oneFileMode );
283291

284292
archiver.addFile( getTestFile( "src/test/resources/manifests/manifest1.mf" ), "one.txt" );
285-
archiver.addFile( getTestFile( "src/test/resources/manifests/manifest2.mf" ), "two.txt", 0664 );
293+
archiver.addFile( getTestFile( "src/test/resources/manifests/manifest2.mf" ), "two.txt", twoFileMode );
286294
archiver.setDestFile( getTestFile( "target/output/archive.tar" ) );
287295

288296
archiver.addSymlink("link_to_test_destinaton", "../test_destination/");
@@ -298,7 +306,7 @@ public void testCreateArchive()
298306
{
299307
if ( te.isDirectory() )
300308
{
301-
assertEquals( "un-expected tar-entry mode for [te.name=" + te.getName() + "]", 0500,
309+
assertEquals( "un-expected tar-entry mode for [te.name=" + te.getName() + "]", directoryMode,
302310
te.getMode() & UnixStat.PERM_MASK );
303311
}
304312
else if ( te.isSymbolicLink() )
@@ -311,15 +319,15 @@ else if ( te.isSymbolicLink() )
311319
{
312320
if ( te.getName().equals( "one.txt" ) )
313321
{
314-
assertEquals( 0640, te.getMode() & UnixStat.PERM_MASK );
322+
assertEquals( oneFileMode, te.getMode() & UnixStat.PERM_MASK );
315323
}
316324
else if ( te.getName().equals( "two.txt" ) )
317325
{
318-
assertEquals( 0664, te.getMode() & UnixStat.PERM_MASK );
326+
assertEquals( twoFileMode, te.getMode() & UnixStat.PERM_MASK );
319327
}
320328
else
321329
{
322-
assertEquals( "un-expected tar-entry mode for [te.name=" + te.getName() + "]", 0400,
330+
assertEquals( "un-expected tar-entry mode for [te.name=" + te.getName() + "]", defaultFileMode,
323331
te.getMode() & UnixStat.PERM_MASK );
324332
}
325333

@@ -334,13 +342,10 @@ public void testCreateArchiveWithJiustASymlink()
334342
TarArchiver archiver = getPosixTarArchiver();
335343

336344
archiver.setDirectoryMode( 0500 );
337-
archiver.getOptions().setDirMode( 0500 );
338345

339346
archiver.setFileMode( 0400 );
340-
archiver.getOptions().setMode( 0400 );
341347

342348
archiver.setFileMode( 0640 );
343-
archiver.getOptions().setMode( 0640 );
344349

345350
archiver.setDestFile( getTestFile( "target/output/symlinkarchive.tar" ) );
346351

0 commit comments

Comments
 (0)