Skip to content

Commit 42eb470

Browse files
khmarbaisekhmarbaise
committed
Merge pull request #26 from plamentotev/use_unknown_mode_const
Use PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE for unknown file mode
2 parents 49ff833 + c19edb8 commit 42eb470

File tree

4 files changed

+24
-19
lines changed

4 files changed

+24
-19
lines changed

‎src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ private ArchiveEntry asArchiveEntry( final AddedResourceCollection collection, f
411411
{
412412
final String destFileName = collection.resources.getName( resource );
413413

414-
int fromResource = -1;
414+
int fromResource = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE;
415415
if ( resource instanceof ResourceAttributeSupplier )
416416
{
417417
final PlexusIoResourceAttributes attrs = ( (ResourceAttributeSupplier) resource ).getAttributes();

‎src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,14 @@ private ArchiveEntry( String name, @Nonnull PlexusIoResource resource, int type,
8686
this.type = type;
8787
int permissions = mode;
8888

89-
if ( mode == -1 && this.attributes == null )
89+
if ( mode == PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE && this.attributes == null )
9090
{
9191
permissions = resource.isFile() ? Archiver.DEFAULT_FILE_MODE
9292
: resource.isSymbolicLink() ? Archiver.DEFAULT_SYMLILNK_MODE : Archiver.DEFAULT_DIR_MODE;
9393
}
9494

95-
this.mode = permissions == -1 ? permissions : ( permissions & UnixStat.PERM_MASK ) |
95+
this.mode = permissions == PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ? permissions
96+
: ( permissions & UnixStat.PERM_MASK ) |
9697
( type == FILE ? UnixStat.FILE_FLAG : type == SYMLINK ? UnixStat.LINK_FLAG : UnixStat.DIR_FLAG );
9798

9899
this.addSynchronously = ( collection != null && !collection.isConcurrentAccessSupported() );

‎src/main/java/org/codehaus/plexus/archiver/diags/TrackingArchiver.java

+19-15
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121

2222
import org.codehaus.plexus.archiver.*;
23+
import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
2324
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
2425
import org.codehaus.plexus.components.io.resources.PlexusIoResourceCollection;
2526
import org.codehaus.plexus.util.StringUtils;
@@ -55,38 +56,39 @@ public void createArchive()
5556
public void addDirectory( final @Nonnull File directory )
5657
throws ArchiverException
5758
{
58-
added.add( new Addition( directory, null, null, null, -1 ) );
59+
added.add( new Addition( directory, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
5960
}
6061

6162
public void addDirectory( final @Nonnull File directory, final String prefix )
6263
throws ArchiverException
6364
{
64-
added.add( new Addition( directory, prefix, null, null, -1 ) );
65+
added.add( new Addition( directory, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
6566
}
6667

6768
public void addDirectory( final @Nonnull File directory, final String[] includes, final String[] excludes )
6869
throws ArchiverException
6970
{
70-
added.add( new Addition( directory, null, includes, excludes, -1 ) );
71+
added.add( new Addition( directory, null, includes, excludes, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
7172
}
7273

7374
public void addDirectory( final @Nonnull File directory, final String prefix, final String[] includes,
7475
final String[] excludes )
7576
throws ArchiverException
7677
{
77-
added.add( new Addition( directory, prefix, includes, excludes, -1 ) );
78+
added.add( new Addition( directory, prefix, includes, excludes,
79+
PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
7880
}
7981

8082
public void addFileSet( final @Nonnull FileSet fileSet )
8183
throws ArchiverException
8284
{
83-
added.add( new Addition( fileSet, null, null, null, -1 ) );
85+
added.add( new Addition( fileSet, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
8486
}
8587

8688
public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName )
8789
throws ArchiverException
8890
{
89-
added.add( new Addition( inputFile, destFileName, null, null, -1 ) );
91+
added.add( new Addition( inputFile, destFileName, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
9092
}
9193

9294
public void addFile( final @Nonnull File inputFile, final @Nonnull String destFileName, final int permissions )
@@ -98,51 +100,53 @@ public void addFile( final @Nonnull File inputFile, final @Nonnull String destFi
98100
public void addArchivedFileSet( final @Nonnull File archiveFile )
99101
throws ArchiverException
100102
{
101-
added.add( new Addition( archiveFile, null, null, null, -1 ) );
103+
added.add( new Addition( archiveFile, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
102104
}
103105

104106
public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix )
105107
throws ArchiverException
106108
{
107-
added.add( new Addition( archiveFile, prefix, null, null, -1 ) );
109+
added.add( new Addition( archiveFile, prefix, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
108110
}
109111

110112
public void addSymlink( String s, String s2 )
111113
throws ArchiverException
112114
{
113-
added.add( new Addition( s, null, null, null, -1 ) );
115+
added.add( new Addition( s, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
114116
}
115117

116118
public void addSymlink( String s, int i, String s2 )
117119
throws ArchiverException
118120
{
119-
added.add( new Addition( s, null, null, null, -1 ) );
121+
added.add( new Addition( s, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
120122

121123
}
122124

123125
public void addArchivedFileSet( final File archiveFile, final String[] includes, final String[] excludes )
124126
throws ArchiverException
125127
{
126-
added.add( new Addition( archiveFile, null, includes, excludes, -1 ) );
128+
added.add( new Addition( archiveFile, null, includes, excludes,
129+
PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
127130
}
128131

129132
public void addArchivedFileSet( final @Nonnull File archiveFile, final String prefix, final String[] includes,
130133
final String[] excludes )
131134
throws ArchiverException
132135
{
133-
added.add( new Addition( archiveFile, prefix, includes, excludes, -1 ) );
136+
added.add( new Addition( archiveFile, prefix, includes, excludes,
137+
PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
134138
}
135139

136140
public void addArchivedFileSet( final ArchivedFileSet fileSet )
137141
throws ArchiverException
138142
{
139-
added.add( new Addition( fileSet, null, null, null, -1 ) );
143+
added.add( new Addition( fileSet, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
140144
}
141145

142146
public void addArchivedFileSet( final ArchivedFileSet fileSet, Charset charset )
143147
throws ArchiverException
144148
{
145-
added.add( new Addition( fileSet, null, null, null, -1 ) );
149+
added.add( new Addition( fileSet, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
146150
}
147151

148152
public void addResource( final PlexusIoResource resource, final String destFileName, final int permissions )
@@ -154,7 +158,7 @@ public void addResource( final PlexusIoResource resource, final String destFileN
154158
public void addResources( final PlexusIoResourceCollection resources )
155159
throws ArchiverException
156160
{
157-
added.add( new Addition( resources, null, null, null, -1 ) );
161+
added.add( new Addition( resources, null, null, null, PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE ) );
158162
}
159163

160164
public File getDestFile()

‎src/main/java/org/codehaus/plexus/archiver/zip/ZipResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private static long getLastModofied( ZipArchiveEntry entry )
4545

4646
public synchronized PlexusIoResourceAttributes getAttributes()
4747
{
48-
int mode = -1;
48+
int mode = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE;
4949
if (entry.getPlatform() == ZipArchiveEntry.PLATFORM_UNIX)
5050
{
5151
mode = entry.getUnixMode();

0 commit comments

Comments
 (0)