From c39ff14ddc5b281b331f225d0c56ad6c71104506 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Mon, 1 May 2017 17:22:32 +0300 Subject: [PATCH 1/9] Bump version for the upcoming breaking changes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 519f9c63..725a7427 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ plexus-io - 2.7.2-SNAPSHOT + 3.0.0-SNAPSHOT Plexus IO Components From f49d2006c264060e26c0e7b392097c0ba0499fd3 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Wed, 3 May 2017 07:57:10 +0300 Subject: [PATCH 2/9] Delete the outdated README file Now the changelog is kept in the Plexus Archiver project and the Java version bit is also going to to outdated after the update to Java 7. --- README.md | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 5a5f3fc2..00000000 --- a/README.md +++ /dev/null @@ -1,24 +0,0 @@ -JDK Versions and compatibility -============================== - -plexus-io supports java 1.5+ and has a number of jdk-level specific features. Since it requires 1.7+ to build, -you can force plexus-io to use "downgrade" features even when running on 1.7, using the system property -Djava.language.downgrade= - -It is therefore recommended to run mvn -Djava.language.downgrade=true clean install before relasing, to assess - that features still work with older jdk versions. - - -Version 2.6 -=========== -PlexusIoZipFileResourceCollection removed from plexus io and added to plexus-archiver 2.10. Older versions -of plexus-archiver may not be compatible with this. - - -Version 2.1 -=========== - -In 2.1, all subclasses of AbstractPlexusIoResource now have to call appropriate parent -constructor, there are no more setters. - -AbstractPlexusIOResourceWithAttributes no longer exists, extend AbstractPlexusIoResource and -implement interface PlexusIoResourceWithAttributes instead. From 2bbfb1017eef3f936c0f36c68b872b2c4d69997e Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Sun, 16 Apr 2017 00:40:49 +0300 Subject: [PATCH 3/9] Upgrade the minimum required Java version to Java 7 --- pom.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 725a7427..5f844554 100644 --- a/pom.xml +++ b/pom.xml @@ -72,8 +72,8 @@ maven-compiler-plugin 3.3 - 1.5 - 1.5 + 1.7 + 1.7 @@ -147,15 +147,9 @@ org.codehaus.mojo.signature - java15 + java17 1.0 - - org.codehaus.plexus.components.io.attributes.Java7FileAttributes - org.codehaus.plexus.components.io.attributes.Java7AttributeUtils - java.nio.file.* - java.io.File - From 80a6c3da2a2b767dc04e06528a21af17de61992b Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Sun, 16 Apr 2017 00:41:04 +0300 Subject: [PATCH 4/9] Remove the pre-Java 7 code related to the file attributes The classes related to file attributes are depending on features introduced in Java 7. To support Java version prior to 7, plexus IO uses reflection check to choose between two different implementations. The legacy one that parses the output from the `ls` command and the Java 7 one that is pure Java. Because now Java 7 is the minimum required version, remove all the reflection Java version checks and remove any legacy code that executes only for Java versions below 7. There were two version of `FileAttributes` - `FileAttributes` and `Java7FileAttributes`. Remove the legacy `FileAttributes` and rename `Java7FileAttributes` to `FileAttributes`. Rename `Java7AttributeUtils` to `AttributeUtils` as there is no longer Java version specific implementations for attributes related classes. NOTE: The commit diff shows `FileAttributes` as changed but it's actually deleted and `Java7FileAttributes` is renamed to `FileAttributes`. The same goes for `FileAttributesTest` and `Java7FileAttributesTest` Also remove `PlexusIoResourceAttributeUtils#getFileAttributesByPath( File dir, boolean recursive, boolean includeNumericUserId )`. `includeNumericUserId` is related to the `ls` command and is no longer needed. Update the tests. Delete no longer needed resources and tests. All tests and resources related to the `ls` output parsing are no longer needed. Also replace `PlexusIoResourceAttributeUtilsTest#testPermissionDenied` with `testNonExistingFolder` - when folder is missing we no longer get `cannot access` response from the `ls` command and the new test method name is more suitable. --- .../io/attributes/AttributeParser.java | 233 ----- ...ttributeUtils.java => AttributeUtils.java} | 2 +- .../io/attributes/FileAttributes.java | 331 +++--- .../io/attributes/Java7FileAttributes.java | 243 ----- .../io/attributes/Java7Reflector.java | 52 - .../PlexusIoResourceAttributeUtils.java | 228 +--- .../io/resources/PlexusIoFileResource.java | 12 +- .../PlexusIoFileResourceCollection.java | 77 +- ...UtilsTest.java => AttributeUtilsTest.java} | 18 +- .../io/attributes/FileAttributesTest.java | 78 +- .../attributes/Java7FileAttributesTest.java | 53 - .../PlexusIoResourceAttributeUtilsTest.java | 285 +---- .../PlexusIoPlexusIoFileResourceTest.java | 6 +- .../io/resources/proxy/ProxyFactoryTest.java | 6 +- src/test/resources/1laR.txt | 985 ------------------ src/test/resources/1nla.txt | 985 ------------------ src/test/resources/CYGWIN_NT-5.1-p1.txt | 77 -- src/test/resources/CYGWIN_NT-5.1-p2.txt | 77 -- src/test/resources/FreeBSD-p1.txt | 76 -- src/test/resources/FreeBSD-p2.txt | 76 -- src/test/resources/Linux-p1.txt | 77 -- src/test/resources/Linux-p2.txt | 77 -- src/test/resources/SunOS-p1.txt | 77 -- src/test/resources/SunOS-p2.txt | 77 -- src/test/resources/Test-p1.txt | 38 - src/test/resources/Test-p2.txt | 38 - src/test/resources/b26-linux-1laR.txt | 139 --- src/test/resources/b26-linux-1nlaR.txt | 139 --- 28 files changed, 199 insertions(+), 4363 deletions(-) delete mode 100644 src/main/java/org/codehaus/plexus/components/io/attributes/AttributeParser.java rename src/main/java/org/codehaus/plexus/components/io/attributes/{Java7AttributeUtils.java => AttributeUtils.java} (99%) delete mode 100644 src/main/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributes.java delete mode 100644 src/main/java/org/codehaus/plexus/components/io/attributes/Java7Reflector.java rename src/test/java/org/codehaus/plexus/components/io/attributes/{Java7AttributeUtilsTest.java => AttributeUtilsTest.java} (69%) delete mode 100644 src/test/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributesTest.java delete mode 100644 src/test/resources/1laR.txt delete mode 100644 src/test/resources/1nla.txt delete mode 100644 src/test/resources/CYGWIN_NT-5.1-p1.txt delete mode 100644 src/test/resources/CYGWIN_NT-5.1-p2.txt delete mode 100644 src/test/resources/FreeBSD-p1.txt delete mode 100644 src/test/resources/FreeBSD-p2.txt delete mode 100644 src/test/resources/Linux-p1.txt delete mode 100644 src/test/resources/Linux-p2.txt delete mode 100644 src/test/resources/SunOS-p1.txt delete mode 100644 src/test/resources/SunOS-p2.txt delete mode 100644 src/test/resources/Test-p1.txt delete mode 100644 src/test/resources/Test-p2.txt delete mode 100644 src/test/resources/b26-linux-1laR.txt delete mode 100644 src/test/resources/b26-linux-1nlaR.txt diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeParser.java b/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeParser.java deleted file mode 100644 index 854ce5e9..00000000 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeParser.java +++ /dev/null @@ -1,233 +0,0 @@ -package org.codehaus.plexus.components.io.attributes; - -/* - * Copyright 2011 The Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.codehaus.plexus.components.io.attributes.proxy.PlexusIoProxyResourceAttributes; -import org.codehaus.plexus.util.cli.StreamConsumer; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; - -/** - * @author Kristian Rosenvold - */ -abstract class AttributeParser - implements StreamConsumer -{ - protected static final Pattern LINE_SPLITTER = Pattern.compile( "\\s+" ); - - protected static final int[] LS_LAST_DATE_PART_INDICES = { 7, 7, 7, 7, 6, 7, 7, 7, 7 }; - - - protected final Map attributesByPath = - new LinkedHashMap(); - - - private final StreamConsumer logger; - - private boolean nextIsPathPrefix = false; - - private String pathPrefix = ""; - - private final SimpleDateFormat[] LS_DATE_FORMATS; - - public AttributeParser( @Nonnull StreamConsumer logger ) - { - this.logger = logger; - LS_DATE_FORMATS = new SimpleDateFormat[]{ new SimpleDateFormat( "MMM dd yyyy" ), - new SimpleDateFormat( "MMM dd yyyy", Locale.ENGLISH ), new SimpleDateFormat( "MMM dd HH:mm" ), - new SimpleDateFormat( "MMM dd HH:mm", Locale.ENGLISH ), new SimpleDateFormat( "yyyy-MM-dd HH:mm" ), - // month-day order is reversed for most non-US locales on MacOSX and FreeBSD - new SimpleDateFormat( "dd MMM HH:mm" ), new SimpleDateFormat( "dd MMM HH:mm", Locale.ENGLISH ), - new SimpleDateFormat( "dd MMM yyyy" ), new SimpleDateFormat( "dd MMM yyyy", Locale.ENGLISH ) }; - } - - public void consumeLine( @Nonnull String line ) - { - if ( !PlexusIoResourceAttributeUtils.totalLinePattern.matcher( line ).matches() ) - { - if ( line.trim().length() == 0 ) - { - nextIsPathPrefix = true; - } - else if ( nextIsPathPrefix ) - { - if ( line.endsWith( ":" ) ) - { - nextIsPathPrefix = false; - pathPrefix = line.substring( 0, line.length() - 1 ); - - if ( !pathPrefix.endsWith( "/" ) ) - { - pathPrefix += "/"; - } - } - } - else - { - String[] parts = LINE_SPLITTER.split( line ); - int lastDatePart = verifyParsability( line, parts, logger ); - - if ( lastDatePart > 0 ) - { - int idx = line.indexOf( parts[lastDatePart] ) + parts[lastDatePart].length() + 1; - - String path = pathPrefix + line.substring( idx ); - while ( path.length() > 0 && Character.isWhitespace( path.charAt( 0 ) ) ) - { - path = path.substring( 1 ); - } - - FileAttributes attributes; - synchronized ( attributesByPath ) - { - attributes = new FileAttributes( parts[0] ); - attributesByPath.put( path, attributes ); - processAttributes( attributes, parts ); - } - } - } - } - logger.consumeLine( line ); - } - - protected abstract void processAttributes( @Nonnull FileAttributes attributes, @Nonnull String[] parts ); - - public Map getAttributesByPath() - { - return attributesByPath; - } - - private int verifyParsability( String line, @Nonnull String[] parts, @Nonnull StreamConsumer logger ) - { - if ( parts.length > 7 ) - { - String dateCandidate = parts[5] + " " + parts[6] + " " + parts[7]; - for ( int i = 0; i < LS_DATE_FORMATS.length; i++ ) - { - try - { - LS_DATE_FORMATS[i].parse( dateCandidate ); - return LS_LAST_DATE_PART_INDICES[i]; - } - catch ( ParseException ignore ) - { - } - } - } - - logger.consumeLine( "Unparseable line: '" + line - + "'\nReason: unrecognized date format; ambiguous start-index for path in listing." ); - return -1; - } - - static class NumericUserIDAttributeParser - extends AttributeParser - { - NumericUserIDAttributeParser( StreamConsumer logger ) - { - super( logger ); - } - - @Override - protected void processAttributes( @Nonnull FileAttributes attributes, @Nonnull String[] parts ) - { - attributes.setUserId( (int) Long.parseLong( parts[2] ) ); - attributes.setGroupId( (int) Long.parseLong( parts[3] ) ); - - } - } - - static class SymbolicUserIDAttributeParser - extends AttributeParser - { - SymbolicUserIDAttributeParser( StreamConsumer logger ) - { - super( logger ); - } - - @Override - protected void processAttributes( @Nonnull FileAttributes attributes, @Nonnull String[] parts ) - { - attributes.setUserName( parts[2] ); - attributes.setGroupName( parts[3] ); - } - - public Map merge( NumericUserIDAttributeParser otherParser ) - { - final Map attributes = getAttributesByPath(); - if ( otherParser == null ) - { - return attributes; - } - final Map result = new HashMap(); - - final Map otherAttributes = otherParser.getAttributesByPath(); - PlexusIoResourceAttributes thisAttribute, otherAttribute; - - Set allKeys = new HashSet( attributes.keySet() ); - allKeys.addAll( otherAttributes.keySet() ); - for ( String key : allKeys ) - { - thisAttribute = attributes.get( key ); - otherAttribute = otherAttributes.get( key ); - if ( thisAttribute == null ) - { // Slight workaround because symbolic parsing is failure prone - thisAttribute = otherAttribute; - result.put( key, thisAttribute ); - } - if ( thisAttribute != null && otherAttribute != null ) - { - result.put( key, new MergedAttributes( thisAttribute, otherAttribute ) ); - } - } - return result; - } - } - - static class MergedAttributes - extends PlexusIoProxyResourceAttributes - { - PlexusIoResourceAttributes otherAttr; - - public MergedAttributes( PlexusIoResourceAttributes thisAttr, PlexusIoResourceAttributes otherAttr ) - { - super( thisAttr ); - this.otherAttr = otherAttr; - } - - @Nullable public Integer getGroupId() - { - return otherAttr.getGroupId(); - } - - public Integer getUserId() - { - return otherAttr.getUserId(); - } - - } -} diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java similarity index 99% rename from src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java rename to src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java index 8ec73d45..2a11d11f 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java @@ -33,7 +33,7 @@ /** * @author Kristian Rosenvold */ -public class Java7AttributeUtils +public class AttributeUtils { /* Reads last-modified with proper failure handling if something goes wrong. diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java index 2cee075e..cdf9858e 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java @@ -16,303 +16,228 @@ * limitations under the License. */ +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.attribute.FileOwnerAttributeView; +import java.nio.file.attribute.PosixFilePermission; +import java.security.Principal; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.Arrays; - -import static org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils.*; -/** - * Attributes that are read by legacy-style attribute parsing. +/* + * File attributes + * Immutable */ public class FileAttributes - implements PlexusIoResourceAttributes -{ - - protected static final char VALUE_DISABLED_MODE = '-'; - - protected static final char VALUE_WRITABLE_MODE = 'w'; - - protected static final char VALUE_READABLE_MODE = 'r'; + implements PlexusIoResourceAttributes { + @Nullable + private final Integer groupId; - protected static final char VALUE_EXECUTABLE_MODE = 'x'; + @Nullable + private final String groupName; - protected static final int INDEX_WORLD_EXECUTE = 9; + @Nullable + private final Integer userId; - protected static final int INDEX_WORLD_WRITE = 8; + private final String userName; - protected static final int INDEX_WORLD_READ = 7; + private final boolean symbolicLink; - protected static final int INDEX_GROUP_EXECUTE = 6; + private final int octalMode; - protected static final int INDEX_GROUP_WRITE = 5; + private final Set permissions; - protected static final int INDEX_GROUP_READ = 4; + public FileAttributes(@Nonnull File file, @Nonnull Map userCache, + @Nonnull Map groupCache) + throws IOException { - protected static final int INDEX_OWNER_EXECUTE = 3; - protected static final int INDEX_OWNER_WRITE = 2; + Path path = file.toPath(); + if (AttributeUtils.isUnix(path)) { + Map attrs = Files.readAttributes(path, "unix:*", LinkOption.NOFOLLOW_LINKS); + this.permissions = (Set) attrs.get("permissions"); - protected static final int INDEX_OWNER_READ = 1; + groupId = (Integer) attrs.get("gid"); - private Integer groupId; - - private String groupName; - - private Integer userId; - - private String userName; - - private char[] mode; + String groupName = groupCache.get(groupId); + if (groupName != null) { + this.groupName = groupName; + } else { + this.groupName = ((Principal) attrs.get("group")).getName(); + groupCache.put(groupId, this.groupName); + } + userId = (Integer) attrs.get("uid"); + String userName = userCache.get(userId); + if (userName != null) { + this.userName = userName; + } else { + this.userName = ((Principal) attrs.get("owner")).getName(); + userCache.put(userId, this.userName); + } + octalMode = (Integer) attrs.get("mode") & 0xfff; // Mask off top bits for compatibilty. Maybe check if we can skip this + symbolicLink = (Boolean) attrs.get("isSymbolicLink"); + } else { + FileOwnerAttributeView fa = AttributeUtils.getFileOwnershipInfo(file); + this.userName = fa.getOwner().getName(); + userId = null; + this.groupName = null; + this.groupId = null; + octalMode = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE; + permissions = Collections.emptySet(); + symbolicLink = Files.isSymbolicLink(path); + } - public FileAttributes(int mode){ - this.mode = new char[10]; - Arrays.fill( this.mode, VALUE_DISABLED_MODE ); - setOctalMode( mode ); } - public FileAttributes(@Nonnull String lsMOdeLine) - { - mode = new char[10]; - Arrays.fill( mode, VALUE_DISABLED_MODE ); - setLsModeline( lsMOdeLine ); + public static + @Nonnull + PlexusIoResourceAttributes uncached(@Nonnull File file) + throws IOException { + return new FileAttributes(file, new HashMap(), new HashMap()); } - protected char[] getLsModeParts() - { - return mode; + + @Nullable + public Integer getGroupId() { + + return groupId; } - private void setLsModeParts( @Nonnull char[] mode ) - { - if ( mode.length < 10 ) - { - this.mode = new char[10]; - System.arraycopy( mode, 0, this.mode, 0, mode.length ); - for ( int i = mode.length; i < 10; i++ ) - { - this.mode[i] = VALUE_DISABLED_MODE; - } - } - else - { - this.mode = mode; - } + public boolean hasGroupId() { + return false; } - @Nullable public Integer getGroupId() - { - return groupId; + public boolean hasUserId() { + return false; } - @Nullable public String getGroupName() - { + @Nullable + public String getGroupName() { return groupName; } - public Integer getUserId() - { + public Integer getUserId() { return userId; } - public String getUserName() - { + public String getUserName() { return userName; } - public boolean isGroupExecutable() - { - return checkFlag( '-', INDEX_GROUP_EXECUTE ); + public boolean isGroupExecutable() { + return containsPermission(PosixFilePermission.GROUP_EXECUTE); } - private boolean checkFlag( char disabledValue, int idx ) - { - return mode != null && mode[idx] != disabledValue; + private boolean containsPermission(PosixFilePermission groupExecute) { + return permissions.contains(groupExecute); } - public boolean isGroupReadable() - { - return checkFlag( '-', INDEX_GROUP_READ ); + public boolean isGroupReadable() { + return containsPermission(PosixFilePermission.GROUP_READ); } - public boolean isGroupWritable() - { - return checkFlag( '-', INDEX_GROUP_WRITE ); + public boolean isGroupWritable() { + return containsPermission(PosixFilePermission.GROUP_WRITE); } - public boolean isOwnerExecutable() - { - return checkFlag( '-', INDEX_OWNER_EXECUTE ); + public boolean isOwnerExecutable() { + return containsPermission(PosixFilePermission.OWNER_EXECUTE); } - public boolean isOwnerReadable() - { - return checkFlag( '-', INDEX_OWNER_READ ); + public boolean isOwnerReadable() { + return containsPermission(PosixFilePermission.OWNER_READ); } - public boolean isOwnerWritable() - { - return checkFlag( '-', INDEX_OWNER_WRITE ); + public boolean isOwnerWritable() { + return containsPermission(PosixFilePermission.OWNER_WRITE); } - public boolean isWorldExecutable() - { - return checkFlag( '-', INDEX_WORLD_EXECUTE ); + public boolean isWorldExecutable() { + return containsPermission(PosixFilePermission.OTHERS_EXECUTE); + } - public boolean isWorldReadable() - { - return checkFlag( '-', INDEX_WORLD_READ ); + public boolean isWorldReadable() { + return containsPermission(PosixFilePermission.OTHERS_READ); } - public boolean isWorldWritable() - { - return checkFlag( '-', INDEX_WORLD_WRITE ); + public boolean isWorldWritable() { + return containsPermission(PosixFilePermission.OTHERS_WRITE); } - public String toString() - { + public String toString() { StringBuilder sb = new StringBuilder(); - sb.append( "\nFile Attributes:\n------------------------------\nuser: " ); - sb.append( userName == null ? "" : userName ); - sb.append( "\ngroup: " ); - sb.append( groupName == null ? "" : groupName ); - sb.append( "\nuid: " ); - sb.append( userId != null ? userId.toString() : ""); - sb.append( "\ngid: " ); - sb.append( groupId != null ? groupId.toString() : ""); - sb.append( "\nmode: " ); - sb.append( mode == null ? "" : String.valueOf( mode ) ); + sb.append("\nFile Attributes:\n------------------------------\nuser: "); + sb.append(userName == null ? "" : userName); + sb.append("\ngroup: "); + sb.append(groupName == null ? "" : groupName); + sb.append("\nuid: "); + sb.append(hasUserId() ? Integer.toString(userId) : ""); + sb.append("\ngid: "); + sb.append(hasGroupId() ? Integer.toString(groupId) : ""); return sb.toString(); } - public int getOctalMode() - { + public int getOctalMode() { + return octalMode; + } + + public int calculatePosixOctalMode() { int result = 0; - if ( isOwnerReadable() ) - { + if (isOwnerReadable()) { result |= AttributeConstants.OCTAL_OWNER_READ; } - if ( isOwnerWritable() ) - { + if (isOwnerWritable()) { result |= AttributeConstants.OCTAL_OWNER_WRITE; } - if ( isOwnerExecutable() ) - { + if (isOwnerExecutable()) { result |= AttributeConstants.OCTAL_OWNER_EXECUTE; } - if ( isGroupReadable() ) - { + if (isGroupReadable()) { result |= AttributeConstants.OCTAL_GROUP_READ; } - if ( isGroupWritable() ) - { + if (isGroupWritable()) { result |= AttributeConstants.OCTAL_GROUP_WRITE; } - if ( isGroupExecutable() ) - { + if (isGroupExecutable()) { result |= AttributeConstants.OCTAL_GROUP_EXECUTE; } - if ( isWorldReadable() ) - { + if (isWorldReadable()) { result |= AttributeConstants.OCTAL_WORLD_READ; } - if ( isWorldWritable() ) - { + if (isWorldWritable()) { result |= AttributeConstants.OCTAL_WORLD_WRITE; } - if ( isWorldExecutable() ) - { + if (isWorldExecutable()) { result |= AttributeConstants.OCTAL_WORLD_EXECUTE; } return result; } - public String getOctalModeString() - { - return Integer.toString( getOctalMode(), 8 ); - } - - public PlexusIoResourceAttributes setGroupId( Integer gid ) - { - this.groupId = gid; - return this; - } - - public PlexusIoResourceAttributes setGroupName( String name ) - { - this.groupName = name; - return this; - } - - public PlexusIoResourceAttributes setUserId( Integer uid ) - { - this.userId = uid; - return this; - } - - public PlexusIoResourceAttributes setUserName( String name ) - { - this.userName = name; - return this; + public String getOctalModeString() { + return Integer.toString(getOctalMode(), 8); } - public PlexusIoResourceAttributes setLsModeline( @Nonnull String modeLine ) - { - setLsModeParts( modeLine.toCharArray() ); - return this; - } - - private void setMode( char value, int modeIdx ) - { - char[] mode = getLsModeParts(); - mode[modeIdx] = value; - - setLsModeParts( mode ); - } - - private void setOctalMode( int mode ) - { - setExecutable( INDEX_OWNER_EXECUTE, isOwnerExecutableInOctal( mode )); - setExecutable( INDEX_GROUP_EXECUTE, isGroupExecutableInOctal( mode ) ); - setExecutable( INDEX_WORLD_EXECUTE, isWorldExecutableInOctal( mode )); - - setReadable( INDEX_OWNER_READ, isOwnerReadableInOctal( mode )); - setReadable( INDEX_GROUP_READ, isGroupReadableInOctal( mode ) ); - setReadable( INDEX_WORLD_READ, isWorldReadableInOctal( mode )); - - setWriteable( INDEX_OWNER_WRITE, isOwnerWritableInOctal( mode )); - setWriteable( INDEX_GROUP_WRITE, isGroupWritableInOctal( mode ) ); - setWriteable( INDEX_WORLD_WRITE, isWorldWritableInOctal( mode )); - } - - private void setExecutable( int index, boolean executable ) - { - setMode( executable ? VALUE_EXECUTABLE_MODE : VALUE_DISABLED_MODE, index ); - } - - private void setReadable( int index, boolean readable ) - { - setMode( readable ? VALUE_READABLE_MODE : VALUE_DISABLED_MODE, index ); - } - private void setWriteable( int index, boolean writable ) - { - setMode( writable ? VALUE_WRITABLE_MODE : VALUE_DISABLED_MODE, index ); - } - // Legacy mode does not support symlinks - public boolean isSymbolicLink() - { - return false; + public boolean isSymbolicLink() { + return symbolicLink; } } \ No newline at end of file diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributes.java deleted file mode 100644 index cae521ca..00000000 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributes.java +++ /dev/null @@ -1,243 +0,0 @@ -package org.codehaus.plexus.components.io.attributes; - -/* - * Copyright 2007 The Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.LinkOption; -import java.nio.file.Path; -import java.nio.file.attribute.FileOwnerAttributeView; -import java.nio.file.attribute.PosixFilePermission; -import java.security.Principal; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -/* - * File attributes for a java7 file that are backed on disk by a file. - * Immutable - */ -public class Java7FileAttributes - implements PlexusIoResourceAttributes { - @Nullable - private final Integer groupId; - - @Nullable - private final String groupName; - - @Nullable - private final Integer userId; - - private final String userName; - - private final boolean symbolicLink; - - private final int octalMode; - - private final Set permissions; - - public Java7FileAttributes(@Nonnull File file, @Nonnull Map userCache, - @Nonnull Map groupCache) - throws IOException { - - - Path path = file.toPath(); - if (Java7AttributeUtils.isUnix(path)) { - Map attrs = Files.readAttributes(path, "unix:*", LinkOption.NOFOLLOW_LINKS); - this.permissions = (Set) attrs.get("permissions"); - - groupId = (Integer) attrs.get("gid"); - - String groupName = groupCache.get(groupId); - if (groupName != null) { - this.groupName = groupName; - } else { - this.groupName = ((Principal) attrs.get("group")).getName(); - groupCache.put(groupId, this.groupName); - } - userId = (Integer) attrs.get("uid"); - String userName = userCache.get(userId); - if (userName != null) { - this.userName = userName; - } else { - this.userName = ((Principal) attrs.get("owner")).getName(); - userCache.put(userId, this.userName); - } - octalMode = (Integer) attrs.get("mode") & 0xfff; // Mask off top bits for compatibilty. Maybe check if we can skip this - symbolicLink = (Boolean) attrs.get("isSymbolicLink"); - } else { - FileOwnerAttributeView fa = Java7AttributeUtils.getFileOwnershipInfo(file); - this.userName = fa.getOwner().getName(); - userId = null; - this.groupName = null; - this.groupId = null; - octalMode = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE; - permissions = Collections.emptySet(); - symbolicLink = Files.isSymbolicLink(path); - } - - } - - public static - @Nonnull - PlexusIoResourceAttributes uncached(@Nonnull File file) - throws IOException { - return new Java7FileAttributes(file, new HashMap(), new HashMap()); - } - - - @Nullable - public Integer getGroupId() { - - return groupId; - } - - public boolean hasGroupId() { - return false; - } - - public boolean hasUserId() { - return false; - } - - @Nullable - public String getGroupName() { - return groupName; - } - - public Integer getUserId() { - return userId; - } - - public String getUserName() { - return userName; - } - - public boolean isGroupExecutable() { - return containsPermission(PosixFilePermission.GROUP_EXECUTE); - } - - private boolean containsPermission(PosixFilePermission groupExecute) { - return permissions.contains(groupExecute); - } - - public boolean isGroupReadable() { - return containsPermission(PosixFilePermission.GROUP_READ); - } - - public boolean isGroupWritable() { - return containsPermission(PosixFilePermission.GROUP_WRITE); - } - - public boolean isOwnerExecutable() { - return containsPermission(PosixFilePermission.OWNER_EXECUTE); - } - - public boolean isOwnerReadable() { - return containsPermission(PosixFilePermission.OWNER_READ); - } - - public boolean isOwnerWritable() { - return containsPermission(PosixFilePermission.OWNER_WRITE); - } - - public boolean isWorldExecutable() { - return containsPermission(PosixFilePermission.OTHERS_EXECUTE); - - } - - public boolean isWorldReadable() { - return containsPermission(PosixFilePermission.OTHERS_READ); - } - - public boolean isWorldWritable() { - return containsPermission(PosixFilePermission.OTHERS_WRITE); - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("\nFile Attributes:\n------------------------------\nuser: "); - sb.append(userName == null ? "" : userName); - sb.append("\ngroup: "); - sb.append(groupName == null ? "" : groupName); - sb.append("\nuid: "); - sb.append(hasUserId() ? Integer.toString(userId) : ""); - sb.append("\ngid: "); - sb.append(hasGroupId() ? Integer.toString(groupId) : ""); - - return sb.toString(); - } - - public int getOctalMode() { - return octalMode; - } - - public int calculatePosixOctalMode() { - int result = 0; - - if (isOwnerReadable()) { - result |= AttributeConstants.OCTAL_OWNER_READ; - } - - if (isOwnerWritable()) { - result |= AttributeConstants.OCTAL_OWNER_WRITE; - } - - if (isOwnerExecutable()) { - result |= AttributeConstants.OCTAL_OWNER_EXECUTE; - } - - if (isGroupReadable()) { - result |= AttributeConstants.OCTAL_GROUP_READ; - } - - if (isGroupWritable()) { - result |= AttributeConstants.OCTAL_GROUP_WRITE; - } - - if (isGroupExecutable()) { - result |= AttributeConstants.OCTAL_GROUP_EXECUTE; - } - - if (isWorldReadable()) { - result |= AttributeConstants.OCTAL_WORLD_READ; - } - - if (isWorldWritable()) { - result |= AttributeConstants.OCTAL_WORLD_WRITE; - } - - if (isWorldExecutable()) { - result |= AttributeConstants.OCTAL_WORLD_EXECUTE; - } - - return result; - } - - public String getOctalModeString() { - return Integer.toString(getOctalMode(), 8); - } - - public boolean isSymbolicLink() { - return symbolicLink; - } -} \ No newline at end of file diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7Reflector.java b/src/main/java/org/codehaus/plexus/components/io/attributes/Java7Reflector.java deleted file mode 100644 index d3f597c4..00000000 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7Reflector.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.codehaus.plexus.components.io.attributes; - -/* - * Copyright 2011 The Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * This class is used *only* because we need to build plexus-io with - * java 1.5/1.6. Once we require 1.7 to build plexus-io the reflection - * can be removed. - * - * @author Kristian Rosenvold - */ -public class Java7Reflector -{ - - private static final boolean isJava7 = isJava7OrMore(); - - private static boolean isJava7OrMore() - { - try - { - Class.forName( "java.nio.file.Files" ); - } - catch ( Exception e ) - { - return false; - } - return true; - } - - public static boolean isLanguageDowngrade(){ - return System.getProperty("java.language.downgrade") != null; - } - - public static boolean isAtLeastJava7() - { - return !isLanguageDowngrade() && isJava7; - } -} diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java index b7e91ba7..58fb8798 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java @@ -17,12 +17,6 @@ */ import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.Os; -import org.codehaus.plexus.util.cli.CommandLineCallable; -import org.codehaus.plexus.util.cli.CommandLineException; -import org.codehaus.plexus.util.cli.CommandLineUtils; -import org.codehaus.plexus.util.cli.Commandline; -import org.codehaus.plexus.util.cli.StreamConsumer; import javax.annotation.Nonnull; import java.io.File; @@ -32,9 +26,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.FutureTask; -import java.util.regex.Pattern; @SuppressWarnings( { "NullableProblems" } ) public final class PlexusIoResourceAttributeUtils @@ -172,7 +163,7 @@ public static boolean isOctalModeEnabled( int mode, int targetMode ) public static PlexusIoResourceAttributes getFileAttributes( File file ) throws IOException { - Map byPath = getFileAttributesByPath( file, false, true ); + Map byPath = getFileAttributesByPath( file, false ); final PlexusIoResourceAttributes o = byPath.get( file.getAbsolutePath() ); if ( o == null ) { @@ -186,134 +177,10 @@ public static PlexusIoResourceAttributes getFileAttributes( File file ) public static Map getFileAttributesByPath( File dir ) throws IOException { - return getFileAttributesByPath( dir, true, true ); + return getFileAttributesByPath( dir, true ); } - public static Map getFileAttributesByPath( File dir, boolean recursive, - boolean includeNumericUserId ) - throws IOException - { - if ( Java7Reflector.isAtLeastJava7() ) - { - return getFileAttributesByPathJava7( dir, recursive ); - } - - if ( !enabledOnCurrentOperatingSystem() ) - { - //noinspection unchecked - return Collections.emptyMap(); - } - - return getFileAttributesByPathScreenScrape( dir, recursive, includeNumericUserId ); - } - - public static void main( String[] args ) - throws IOException - { - if ( args.length < 0 ) - { - System.out.println( "You must supply one directory to scan:" ); - return; - } - File dir = new File( args[0] ); - final Map fileAttributesByPathScreenScrape = - getFileAttributesByPathScreenScrape( dir, true, true ); - for ( String s : fileAttributesByPathScreenScrape.keySet() ) - { - System.out.println( s + ":" + fileAttributesByPathScreenScrape.get( s ) ); - } - - - } - - static Map getFileAttributesByPathScreenScrape( File dir, boolean recursive, - boolean includeNumericUserId ) - throws IOException - { - StringBuilder loggerCache = new StringBuilder(); - StreamConsumer logger = createStringBuilderStreamConsumer( loggerCache ); - - AttributeParser.NumericUserIDAttributeParser numericIdParser = null; - FutureTask integerFutureTask = null; - Commandline numericCli; - if ( includeNumericUserId ) - { - numericIdParser = new AttributeParser.NumericUserIDAttributeParser( logger ); - - String lsOptions1 = "-1nla" + ( recursive ? "R" : "d" ); - StreamConsumer stdErr = new ErrorMessageStreamConsumer(); - try - { - numericCli = setupCommandLine( dir, lsOptions1, logger ); - - CommandLineCallable commandLineCallable = - CommandLineUtils.executeCommandLineAsCallable( numericCli, null, numericIdParser, stdErr, 0 ); - - integerFutureTask = new FutureTask( commandLineCallable ); - new Thread( integerFutureTask ).start(); - } - catch ( CommandLineException e ) - { - IOException error = new IOException( - "Failed to quote directory: '" + dir + "':" + e.getMessage() + "\n" + stdErr.toString() + logger.toString() ); - error.initCause( e ); - throw error; - } - } - -// loggerCache.setLength( 0 ); - AttributeParser.SymbolicUserIDAttributeParser userId = getNameBasedParser( dir, logger, recursive ); - - if ( includeNumericUserId ) - { - final Integer result; - try - { - result = integerFutureTask.get(); - } - catch ( InterruptedException e ) - { - throw new RuntimeException( e ); - } - catch ( ExecutionException e ) - { - throw new RuntimeException( e ); - } - - if ( result != 0 ) - { - throw new IOException( "Failed (3) to retrieve numeric file attributes using:\n" + logger.toString() ); - } - } - - return userId.merge( numericIdParser ); - } - - private static AttributeParser.SymbolicUserIDAttributeParser getNameBasedParser( File dir, StreamConsumer logger, - boolean recursive ) - throws IOException - { - AttributeParser.SymbolicUserIDAttributeParser userId = - new AttributeParser.SymbolicUserIDAttributeParser( logger ); - - StreamConsumer stdErr = new ErrorMessageStreamConsumer(); - String lsOptions2 = "-1la" + ( recursive ? "R" : "d" ); - try - { - executeLs( dir, lsOptions2, userId, logger ); - } - catch ( CommandLineException e ) - { - IOException error = - new IOException( "Failed to quote directory(2): '" + dir + "':" + e.getMessage() + "\n" + stdErr.toString() + logger.toString() ); - error.initCause( e ); - - throw error; - } - return userId; - } - - private static @Nonnull Map getFileAttributesByPathJava7( @Nonnull File dir, boolean recursive ) + public static @Nonnull Map getFileAttributesByPath(@Nonnull File dir, boolean recursive ) throws IOException { Map userCache = new HashMap(); @@ -334,96 +201,9 @@ private static AttributeParser.SymbolicUserIDAttributeParser getNameBasedParser( for ( String fileAndDirectoryName : fileAndDirectoryNames ) { attributesByPath.put( fileAndDirectoryName, - new Java7FileAttributes( new File( fileAndDirectoryName ), userCache, groupCache ) ); + new FileAttributes( new File( fileAndDirectoryName ), userCache, groupCache ) ); } return attributesByPath; } - - private static boolean enabledOnCurrentOperatingSystem() - { - return !Os.isFamily( Os.FAMILY_WINDOWS ) && !Os.isFamily( Os.FAMILY_WIN9X ); - } - - - private static void executeLs( File dir, String options, StreamConsumer parser, StreamConsumer logger ) - throws IOException, CommandLineException - { - Commandline numericCli = setupCommandLine( dir, options, logger ); - - StreamConsumer stdErr = new ErrorMessageStreamConsumer(); - try - { - int result = CommandLineUtils.executeCommandLine( numericCli, parser, stdErr ); - - if ( result != 0 ) - { - throw new IOException( stdErr.toString() + - "When scraping numeric file attributes:\n" + logger.toString() ); - } - } - catch ( CommandLineException e ) - { - IOException error = new IOException( - "Failed (2) to retrieve numeric file attributes using:\n" + stdErr.toString() + "\n" - + logger.toString() ); - error.initCause( e ); - - throw error; - } - } - - private static Commandline setupCommandLine( @Nonnull File dir, String options, StreamConsumer logger ) - { - Commandline numericCli = new Commandline(); - - numericCli.getShell().setQuotedArgumentsEnabled( true ); - numericCli.getShell().setQuotedExecutableEnabled( false ); - - numericCli.addEnvironment( "LANG", "C" ); - numericCli.addEnvironment( "TIME_STYLE", "long-iso" ); - numericCli.setExecutable( "ls" ); - - numericCli.createArg().setLine( options ); - - numericCli.createArg().setValue( dir.getAbsolutePath() ); - - logger.consumeLine( "\nExecuting: " + numericCli.toString() + "\n" ); - return numericCli; - } - - static class ErrorMessageStreamConsumer - implements StreamConsumer - { - - StringBuilder errorOutput = new StringBuilder(); - - public synchronized void consumeLine( String line ) - { - errorOutput.append( line ).append( "\n" ); - } - - public synchronized String toString() - { - return errorOutput.toString(); - } - } - - private static @Nonnull StreamConsumer createStringBuilderStreamConsumer( @Nonnull final StringBuilder sb ) - { - return new StreamConsumer() - { - public synchronized void consumeLine( String line ) - { - sb.append( line ).append( "\n" ); - } - - public synchronized String toString() - { - return sb.toString(); - } - }; - } - - static final Pattern totalLinePattern = Pattern.compile( "\\w*\\s\\d*" ); } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java index 2b702007..53000b72 100755 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java @@ -25,8 +25,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.io.output.DeferredFileOutputStream; -import org.codehaus.plexus.components.io.attributes.Java7AttributeUtils; -import org.codehaus.plexus.components.io.attributes.Java7Reflector; +import org.codehaus.plexus.components.io.attributes.AttributeUtils; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; import org.codehaus.plexus.components.io.functions.ContentSupplier; import org.codehaus.plexus.components.io.functions.FileSupplier; @@ -188,14 +187,7 @@ public boolean isFile() public long getLastModified() { - if ( Java7Reflector.isAtLeastJava7() ) - { - return Java7AttributeUtils.getLastModified( getFile() ); - } - else - { - return getFile().lastModified(); - } + return AttributeUtils.getLastModified( getFile() ); } @Override public boolean isSymbolicLink() { diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java index 07ebd289..333a2b26 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java @@ -16,9 +16,7 @@ * limitations under the License. */ -import org.codehaus.plexus.components.io.attributes.Java7FileAttributes; -import org.codehaus.plexus.components.io.attributes.Java7Reflector; -import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributeUtils; +import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes; import org.codehaus.plexus.components.io.functions.PlexusIoResourceConsumer; @@ -33,7 +31,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -143,42 +140,7 @@ public void setPrefix(String prefix) { super.setPrefix(StringUtils.replace( prefix, nonSeparator, File.separatorChar)); } - private void addResources( List result, String[] resources, - Map attributesByPath ) - throws IOException - { - - final File dir = getBaseDir(); - for ( String name : resources ) - { - String sourceDir = name.replace( '\\', '/' ); - - File f = new File( dir, sourceDir ); - - PlexusIoResourceAttributes attrs = attributesByPath.get( name.length() > 0 ? name : "." ); - if ( attrs == null ) - { - attrs = attributesByPath.get( f.getAbsolutePath() ); - } - if ( attrs == null ) - { - attrs = SimpleResourceAttributes.lastResortDummyAttributesForBrokenOS(); - } - - attrs = mergeAttributes( attrs, f.isDirectory() ); - - String remappedName = getName( name ); - - PlexusIoResource resource = ResourceFactory.createResource( f, remappedName, null, getStreamTransformer(), attrs ); - if ( isSelected( resource ) ) - { - result.add( resolve(resource) ); - } - } - } - - - private void addResourcesJava7( List result, String[] resources ) + private void addResources( List result, String[] resources ) throws IOException { @@ -190,7 +152,7 @@ private void addResourcesJava7( List result, String[] resource String sourceDir = name.replace( '\\', '/' ); File f = new File( dir, sourceDir ); - PlexusIoResourceAttributes attrs = new Java7FileAttributes( f, cache1, cache2 ); + PlexusIoResourceAttributes attrs = new FileAttributes( f, cache1, cache2 ); attrs = mergeAttributes( attrs, f.isDirectory() ); String remappedName = getName( name ); @@ -279,35 +241,16 @@ public Iterator getResources() ds.setFollowSymlinks( isFollowingSymLinks() ); ds.scan(); - if ( Java7Reflector.isAtLeastJava7() ) + final List result = new ArrayList(); + if ( isIncludingEmptyDirectories() ) { - final List result = new ArrayList(); - if ( isIncludingEmptyDirectories() ) - { - String[] dirs = ds.getIncludedDirectories(); - addResourcesJava7( result, dirs ); - } - - String[] files = ds.getIncludedFiles(); - addResourcesJava7( result, files ); - return result.iterator(); + String[] dirs = ds.getIncludedDirectories(); + addResources( result, dirs ); } - else - { - Map attributesByPath = - PlexusIoResourceAttributeUtils.getFileAttributesByPath( getBaseDir() ); - final List result = new ArrayList(); - if ( isIncludingEmptyDirectories() ) - { - String[] dirs = ds.getIncludedDirectories(); - addResources( result, dirs, attributesByPath ); - } - - String[] files = ds.getIncludedFiles(); - addResources( result, files, attributesByPath ); - return result.iterator(); - } + String[] files = ds.getIncludedFiles(); + addResources( result, files ); + return result.iterator(); } public boolean isConcurrentAccessSupported() { diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java similarity index 69% rename from src/test/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtilsTest.java rename to src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java index a0832c4b..6dfcb2f7 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java @@ -12,13 +12,13 @@ /** * @author Kristian Rosenvold */ -public class Java7AttributeUtilsTest +public class AttributeUtilsTest extends TestCase { public void testMiscPatterns() throws Exception { - final Set permissions = Java7AttributeUtils.getPermissions( 0124 ); + final Set permissions = AttributeUtils.getPermissions( 0124 ); assertTrue( permissions.contains( PosixFilePermission.OWNER_EXECUTE ) ); assertTrue(permissions.contains( PosixFilePermission.GROUP_WRITE )); assertTrue(permissions.contains( PosixFilePermission.OTHERS_READ )); @@ -27,7 +27,7 @@ public void testMiscPatterns() public void testMorePatterns() throws Exception { - final Set permissions = Java7AttributeUtils.getPermissions( 0241 ); + final Set permissions = AttributeUtils.getPermissions( 0241 ); assertTrue(permissions.contains( PosixFilePermission.OWNER_WRITE )); assertTrue(permissions.contains( PosixFilePermission.GROUP_READ )); assertTrue(permissions.contains( PosixFilePermission.OTHERS_EXECUTE )); @@ -36,7 +36,7 @@ public void testMorePatterns() public void testEvenMorePatterns() throws Exception { - final Set permissions = Java7AttributeUtils.getPermissions( 0412 ); + final Set permissions = AttributeUtils.getPermissions( 0412 ); assertTrue(permissions.contains( PosixFilePermission.OWNER_READ )); assertTrue(permissions.contains( PosixFilePermission.GROUP_EXECUTE )); assertTrue(permissions.contains( PosixFilePermission.OTHERS_WRITE )); @@ -45,7 +45,7 @@ public void testEvenMorePatterns() public void test777() throws Exception { - final Set permissions = Java7AttributeUtils.getPermissions( 0777 ); + final Set permissions = AttributeUtils.getPermissions( 0777 ); assertTrue( permissions.size() == 9); } @@ -54,13 +54,13 @@ public void testChmodBackAndForth() { if ( Os.isFamily( Os.FAMILY_WINDOWS )) return; final File bxx = File.createTempFile( "bxx", "ff" ); - Java7AttributeUtils.chmod( bxx, 0422 ); - PlexusIoResourceAttributes firstAttrs = new Java7FileAttributes( bxx, new HashMap( ), new HashMap( ) ); + AttributeUtils.chmod( bxx, 0422 ); + PlexusIoResourceAttributes firstAttrs = new FileAttributes( bxx, new HashMap( ), new HashMap( ) ); assertTrue( firstAttrs.isOwnerReadable() ); assertFalse( firstAttrs.isOwnerWritable() ); assertFalse( firstAttrs.isOwnerExecutable() ); - Java7AttributeUtils.chmod( bxx, 0777 ); - PlexusIoResourceAttributes secondAttrs = new Java7FileAttributes( bxx, new HashMap( ), new HashMap( ) ); + AttributeUtils.chmod( bxx, 0777 ); + PlexusIoResourceAttributes secondAttrs = new FileAttributes( bxx, new HashMap( ), new HashMap( ) ); assertTrue( secondAttrs.isOwnerReadable() ); assertTrue( secondAttrs.isOwnerWritable() ); assertTrue( secondAttrs.isOwnerExecutable() ); diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java index 38a08d71..51e337b7 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java @@ -1,5 +1,7 @@ +package org.codehaus.plexus.components.io.attributes; + /* - * Copyright 2016 Plexus developers. + * Copyright 2011 The Codehaus Foundation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,66 +16,34 @@ * limitations under the License. */ -package org.codehaus.plexus.components.io.attributes; - +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import org.codehaus.plexus.util.Os; +import junit.framework.TestCase; +/** + * @author Kristian Rosenvold + */ public class FileAttributesTest - extends AbstractResourceAttributesTCK + extends TestCase { - - protected PlexusIoResourceAttributes newAttributes( int mode ) - { - return new FileAttributes(mode); - } - - protected PlexusIoResourceAttributes newAttributes( String lsModeLine ) + public void testGetPosixFileAttributes() + throws Exception { - return new FileAttributes(lsModeLine); - } - public void testSetLsMode_OwnerModes() - { - verifyLsModeSet( "-rwS------", new boolean[]{ true, true, true, false, false, false, false, false, false } ); - verifyLsModeSet( "-rwx------", new boolean[]{ true, true, true, false, false, false, false, false, false } ); - verifyLsModeSet( "-rw-------", new boolean[]{ true, true, false, false, false, false, false, false, false } ); - verifyLsModeSet( "-r--------", new boolean[]{ true, false, false, false, false, false, false, false, false } ); - verifyLsModeSet( "--w-------", new boolean[]{ false, true, false, false, false, false, false, false, false } ); - } + if ( Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_WIN9X ) ) + { + return; + } - public void testSetLsMode_GroupModes() - { - verifyLsModeSet( "----rwS---", new boolean[]{ false, false, false, true, true, true, false, false, false } ); - verifyLsModeSet( "----rwx---", new boolean[]{ false, false, false, true, true, true, false, false, false } ); - verifyLsModeSet( "----rw----", new boolean[]{ false, false, false, true, true, false, false, false, false } ); - verifyLsModeSet( "----r-----", new boolean[]{ false, false, false, true, false, false, false, false, false } ); - verifyLsModeSet( "-----w----", new boolean[]{ false, false, false, false, true, false, false, false, false } ); - } + File file = new File( "." ); + Map userCache = new HashMap(); + Map groupCache = new HashMap(); - public void testSetLsMode_WorldModes() - { - verifyLsModeSet( "-------rwx", new boolean[]{ false, false, false, false, false, false, true, true, true } ); - verifyLsModeSet( "-------rw-", new boolean[]{ false, false, false, false, false, false, true, true, false } ); - verifyLsModeSet( "-------r--", new boolean[]{ false, false, false, false, false, false, true, false, false } ); - verifyLsModeSet( "--------w-", new boolean[]{ false, false, false, false, false, false, false, true, false } ); + PlexusIoResourceAttributes fa = new FileAttributes( file, userCache, groupCache ); + assertNotNull( fa ); } - private void verifyLsModeSet( String mode, boolean[] checkValues ) - { - PlexusIoResourceAttributes attrs = newAttributes( mode ); - - - assertEquals( checkValues[0], attrs.isOwnerReadable() ); - assertEquals( checkValues[1], attrs.isOwnerWritable() ); - assertEquals( checkValues[2], attrs.isOwnerExecutable() ); - - assertEquals( checkValues[3], attrs.isGroupReadable() ); - assertEquals( checkValues[4], attrs.isGroupWritable() ); - assertEquals( checkValues[5], attrs.isGroupExecutable() ); - - assertEquals( checkValues[6], attrs.isWorldReadable() ); - assertEquals( checkValues[7], attrs.isWorldWritable() ); - assertEquals( checkValues[8], attrs.isWorldExecutable() ); - } - -} \ No newline at end of file +} diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributesTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributesTest.java deleted file mode 100644 index 5e7809dc..00000000 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/Java7FileAttributesTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.codehaus.plexus.components.io.attributes; - -/* - * Copyright 2011 The Codehaus Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import org.codehaus.plexus.util.Os; - -import junit.framework.TestCase; - -/** - * @author Kristian Rosenvold - */ -public class Java7FileAttributesTest - extends TestCase -{ - public void testGetPosixFileAttributes() - throws Exception - { - - if ( Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_WIN9X ) ) - { - return; - } - if ( !Java7Reflector.isAtLeastJava7() ) - { - return; - } - - File file = new File( "." ); - Map userCache = new HashMap(); - Map groupCache = new HashMap(); - - PlexusIoResourceAttributes fa = new Java7FileAttributes( file, userCache, groupCache ); - assertNotNull( fa ); - } - -} diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java index 52c464c5..43c17631 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java @@ -16,23 +16,15 @@ * limitations under the License. */ -import junit.framework.Assert; -import org.codehaus.plexus.components.io.attributes.AttributeParser.NumericUserIDAttributeParser; import org.codehaus.plexus.util.Os; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.cli.CommandLineException; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.codehaus.plexus.util.cli.Commandline; -import org.codehaus.plexus.util.cli.StreamConsumer; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.net.URL; -import java.util.Locale; import java.util.Map; import junit.framework.TestCase; @@ -43,25 +35,6 @@ public class PlexusIoResourceAttributeUtilsTest extends TestCase { - private Locale origSystemLocale; - - @Override - protected void setUp() - throws Exception - { - this.origSystemLocale = Locale.getDefault(); - // sample ls output files have US date format and we use SimpleDateFormt with system locale for ls date format parsing - // otherwise test could fail on systems with non-US locales - Locale.setDefault( Locale.US ); - } - - @Override - protected void tearDown() - throws Exception - { - Locale.setDefault( origSystemLocale ); - } - public void testGetAttributesForThisTestClass() throws IOException { @@ -82,10 +55,10 @@ public void testGetAttributesForThisTestClass() File f = new File( resource.getPath().replaceAll( "%20", " " ) ); - Map attrs = - PlexusIoResourceAttributeUtils.getFileAttributesByPath( f, true, true ); + Map attrs = + PlexusIoResourceAttributeUtils.getFileAttributesByPath( f, true ); - PlexusIoResourceAttributes fileAttrs = (PlexusIoResourceAttributes) attrs.get( f.getAbsolutePath() ); + PlexusIoResourceAttributes fileAttrs = attrs.get( f.getAbsolutePath() ); System.out.println( "Got attributes for: " + f.getAbsolutePath() + fileAttrs ); @@ -94,7 +67,7 @@ public void testGetAttributesForThisTestClass() assertEquals( System.getProperty( "user.name" ), fileAttrs.getUserName() ); } - public void testFolderJava7() + public void testFolder() throws IOException, CommandLineException { if (Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_WIN9X )){ @@ -117,9 +90,10 @@ public void testFolderJava7() commandLine.addArguments(new String[]{"763", f.getAbsolutePath()}); CommandLineUtils.executeCommandLine(commandLine, null , null); - Map attrs = PlexusIoResourceAttributeUtils.getFileAttributesByPath( aDir, true, true ); + Map attrs = + PlexusIoResourceAttributeUtils.getFileAttributesByPath( aDir, true ); - PlexusIoResourceAttributes fileAttrs = (PlexusIoResourceAttributes) attrs.get( f.getAbsolutePath() ); + PlexusIoResourceAttributes fileAttrs = attrs.get( f.getAbsolutePath() ); assertTrue( fileAttrs.isGroupReadable()); assertTrue( fileAttrs.isGroupWritable()); @@ -136,60 +110,16 @@ public void testFolderJava7() assertNotNull(fileAttrs); } - - public void testAttributeParsers() - { - assertTrue( PlexusIoResourceAttributeUtils.totalLinePattern.matcher( "totalt 420" ).matches() ); - assertTrue( PlexusIoResourceAttributeUtils.totalLinePattern.matcher( "total 420" ).matches() ); - assertTrue( PlexusIoResourceAttributeUtils.totalLinePattern.matcher( "JSHS 420" ).matches() ); - } - - // to make a new testcase - // Checkout plexus-io, and from the root of the module type the following: - // ls -1nlaR src/main/java/org/codehaus/plexus/components >src/test/resources/`uname`-p1.txt - // ls -1laR src/main/java/org/codehaus/plexus/components >src/test/resources/`uname`-p2.txt - // Then a test-method that tests the output- - - public void ignoredTestParserUbuntu10_04_en() - throws Exception - { - final Map map = checkStream( "Linux" ); - - final FileAttributes o = (FileAttributes) map.get( - "src/main/java/org/codehaus/plexus/components/io/attributes/AttributeConstants.java" ); - - // -rw-r--r-- 1 1020 1030 11108 Mar 16 22:42 build.xml - assertEquals( "-rw-rw-r--", new String( o.getLsModeParts() ) ); - assertEquals( 1020, o.getUserId().intValue() ); - assertEquals( 1030, o.getGroupId().intValue() ); - // Should probably test pass 2 too... - } - - public void testANotherOneWithTrouble() - throws Exception - { - String output = "drwxr-xr-x+ 13 kristian staff 442 Oct 11 14:14 .."; - ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream( output.getBytes() ); - AttributeParser parser = getNameBasedParser1la(); - parse( byteArrayInputStream, parser ); - - } - public void testSingleLine() - throws Exception - { - String output = - "-rw-r--r-- 1 1003 1002 1533 2010-04-23 14:34 /home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1W/checkout/spi/pom.xml"; - ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream( output.getBytes() ); - AttributeParser parser = getNumericParser1nla(); - parse( byteArrayInputStream, parser ); -} - public void testSrcResource() - throws IOException + throws IOException { + if (Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_WIN9X )){ + return; // Nothing to do here. + } + File dir = new File("src/test/resources/symlinks"); final Map fileAttributesByPathScreenScrape = - PlexusIoResourceAttributeUtils.getFileAttributesByPathScreenScrape( dir, true, true ); + PlexusIoResourceAttributeUtils.getFileAttributesByPath( dir, true ); assertNotNull( fileAttributesByPathScreenScrape); PlexusIoResourceAttributes pr = null; for ( String s : fileAttributesByPathScreenScrape.keySet() ) @@ -200,13 +130,11 @@ public void testSrcResource() assertTrue(pr.getOctalMode() > 0); } - public void testPermissionDenied() + public void testNonExistingDirectory() { - File dir = new File("src/test/lsPerms"); + File dir = new File("src/test/noSuchDirectory"); try { - PlexusIoResourceAttributeUtils.getFileAttributesByPathScreenScrape( dir, true, - true ); - // We could search for permission denied here and throw some kind of specialized exception. + PlexusIoResourceAttributeUtils.getFileAttributesByPath( dir, true ); fail("We were supposed to get an io exceptions"); } catch (IOException ignore) { @@ -214,105 +142,6 @@ public void testPermissionDenied() } } - public void testReversedMonthDayOrder() - throws Exception - { - String output = // - "-rw-r--r-- 1 501 80 7683 31 May 10:06 pom_newer.xml\n" + // - "-rwxr--r-- 1 502 81 7683 1 Jun 2010 pom_older.xml"; - InputStream byteArrayInputStream = new ByteArrayInputStream( output.getBytes() ); - NumericUserIDAttributeParser parser = getNumericParser1nla(); - parse( byteArrayInputStream, parser ); - Map map = parser.getAttributesByPath(); - - // 6 months or newer ls date format - FileAttributes newerFileAttr = (FileAttributes) map.get( "pom_newer.xml" ); - assertNotNull( newerFileAttr ); - assertEquals( "-rw-r--r--", new String( newerFileAttr.getLsModeParts() ) ); - assertEquals( 501, newerFileAttr.getUserId().intValue() ); - assertEquals( 80, newerFileAttr.getGroupId().intValue() ); - - // older than 6 months ls date format - FileAttributes olderFileAttr = (FileAttributes) map.get( "pom_older.xml" ); - assertNotNull( olderFileAttr ); - assertEquals( "-rwxr--r--", new String( olderFileAttr.getLsModeParts() ) ); - assertEquals( 502, olderFileAttr.getUserId().intValue() ); - assertEquals( 81, olderFileAttr.getGroupId().intValue() ); - } - - public void testOddLinuxFormatWithExtermelyLargeNumericsSingleLine() - throws Exception - { - String output = - "-rw-rw-r-- 1 4294967294 4294967294 7901 2011-06-07 18:39 /mnt/work/src/maven-plugins-trunk/maven-compiler-plugin/pom.xml"; - ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream( output.getBytes() ); - AttributeParser parser = getNumericParser1nla(); - parse( byteArrayInputStream, parser ); - } - - public void testMacOsWithSpace() throws Exception { - String output = - "-rwxrw--wx 1 kristian DOMZZZ\\Domain Users 15387 Oct 20 15:30 /Users/kristian/lsrc/plexus/plexus-io/target/test-classes/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.class"; - ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream( output.getBytes() ); - AttributeParser parser = getNameBasedParser1la(); - parse( byteArrayInputStream, parser ); - final Map attributesByPath = parser.getAttributesByPath(); - String path = "/Users/kristian/lsrc/plexus/plexus-io/target/test-classes/org/codehaus/plexus/components/io/attributes/"; - } - - public void testMacOsLine() - throws Exception - { - String line = "drwxr-xr-x+ 3 1000 20 102 Oct 11 14:24 .."; - ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream( line.getBytes() ); - AttributeParser parser = getNumericParser1nla(); - parse( byteArrayInputStream, parser ); - - } - public void ignoredTestParserCygwin() - throws Exception - { - final Map map = checkStream( "CYGWIN_NT-5.1" ); - final FileAttributes o = (FileAttributes) map.get( - "src/main/java/org/codehaus/plexus/components/io/attributes/AttributeConstants.java" ); - - // -rw-r--r-- 1 1020 1030 11108 Mar 16 22:42 build.xml - assertEquals( "-rw-r--r--", new String( o.getLsModeParts() ) ); - assertEquals( 203222, o.getUserId().intValue() ); - assertEquals( 10513, o.getGroupId().intValue() ); - } - - public void testParserSolaris() - throws Exception - { - checkStream( "SunOS" ); - } - - public void testMisc() - throws Exception - { - checkStream( "Test" ); - } - - public void testParserFreeBsd() - throws Exception - { - checkStream( "FreeBSD" ); - } - - public void testParserb26() - throws Exception - { - final Map map = checkStream2( "b26-linux" ); - PlexusIoResourceAttributes attrs = null; - for ( String s : map.keySet() ) - { - if (s.endsWith( "App.java" )) attrs = map.get(s); - } - Assert.assertEquals( 0664, attrs.getOctalMode() ); - - } - public void testMergeAttributesWithNullBase() { PlexusIoResourceAttributes override = @@ -528,86 +357,4 @@ public void testMergeAttributesDefault() assertEquals( 0, attributes.getOctalMode() ); } - private InputStream getStream( String s ) - { - return this.getClass().getClassLoader().getResourceAsStream( s ); - } - - private Map checkStream( String baseName ) - throws Exception - { - - - AttributeParser.NumericUserIDAttributeParser numericParser = getNumericParser1nla(); - InputStream phase1 = getStream( baseName + "-p1.txt" ); - parse( phase1, numericParser ); - - - final AttributeParser.SymbolicUserIDAttributeParser nameBasedParser = getNameBasedParser1la(); - InputStream phase2 = getStream( baseName + "-p2.txt" ); - parse( phase2, nameBasedParser ); - - return nameBasedParser.merge( numericParser ); - } - - private Map checkStream2( String baseName ) - throws Exception - { - - - AttributeParser.NumericUserIDAttributeParser numericParser = getNumericParser1nla(); - InputStream phase1 = getStream( baseName + "-1nlaR.txt" ); - parse( phase1, numericParser ); - - - final AttributeParser.SymbolicUserIDAttributeParser nameBasedParser = getNameBasedParser1la(); - InputStream phase2 = getStream( baseName + "-1laR.txt" ); - parse( phase2, nameBasedParser ); - - return nameBasedParser.merge( numericParser ); - } - - private AttributeParser.NumericUserIDAttributeParser getNumericParser1nla() - { - return new AttributeParser.NumericUserIDAttributeParser( createConsoleLogger() ); - } - - private AttributeParser.SymbolicUserIDAttributeParser getNameBasedParser1la() - { - return new AttributeParser.SymbolicUserIDAttributeParser( createConsoleLogger() ); - } - - private StreamConsumer createConsoleLogger() - { - return new StreamConsumer() - { - public void consumeLine( String line ) - { - System.out.println(line); - } - }; - } - - private void parse( InputStream stream, AttributeParser parser ) - throws Exception - { - BufferedReader bufferedReader = new BufferedReader( new InputStreamReader( stream ) ); - String line = bufferedReader.readLine(); - int lineNum = 0; - try - { - while ( line != null ) - { - parser.consumeLine( line ); - line = bufferedReader.readLine(); - lineNum++; - } - } - catch ( Exception e ) - { - Exception exception = new Exception( "At line " + lineNum + "in source:" + line ); - exception.initCause( e ); - throw e; - } - } } diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java index b4391319..2b3e397f 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java @@ -3,8 +3,7 @@ import java.io.File; import java.io.IOException; -import org.codehaus.plexus.components.io.attributes.Java7FileAttributes; -import org.codehaus.plexus.components.io.attributes.Java7Reflector; +import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; import junit.framework.TestCase; @@ -17,10 +16,9 @@ public class PlexusIoPlexusIoFileResourceTest public void testRealSymlink() throws IOException { - if (!Java7Reflector.isAtLeastJava7()) return; if ( Os.isFamily(Os.FAMILY_WINDOWS)) return; final File file = new File( "src/test/resources/symlinks/src/symDir" ); - PlexusIoResourceAttributes attrs = Java7FileAttributes.uncached( file ); + PlexusIoResourceAttributes attrs = FileAttributes.uncached( file ); assertTrue(attrs.isSymbolicLink()); PlexusIoFileResource r = new PlexusIoFileResource( file, "symDir", attrs); assertTrue(r.isSymbolicLink()); diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java index 6d94d27c..03f5bf13 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java @@ -1,7 +1,7 @@ package org.codehaus.plexus.components.io.resources.proxy; import junit.framework.TestCase; -import org.codehaus.plexus.components.io.attributes.Java7FileAttributes; +import org.codehaus.plexus.components.io.attributes.FileAttributes; import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes; import org.codehaus.plexus.components.io.attributes.SimpleResourceAttributes; import org.codehaus.plexus.components.io.functions.ContentSupplier; @@ -114,7 +114,7 @@ private PlexusIoFileResource getPomResource() throws IOException { final File file = new File( "pom.xml" ); - PlexusIoResourceAttributes attrs = Java7FileAttributes.uncached( file ); + PlexusIoResourceAttributes attrs = FileAttributes.uncached( file ); return new PlexusIoFileResource( file, "pom.xml", attrs ){}; } @@ -136,7 +136,7 @@ private Dummy getDummySymlinkResource() throws IOException { final File file = new File( "pom.xml" ); - PlexusIoResourceAttributes attrs = Java7FileAttributes.uncached( file ); + PlexusIoResourceAttributes attrs = FileAttributes.uncached( file ); return new Dummy( file, attrs ); } diff --git a/src/test/resources/1laR.txt b/src/test/resources/1laR.txt deleted file mode 100644 index c4edb9c7..00000000 --- a/src/test/resources/1laR.txt +++ /dev/null @@ -1,985 +0,0 @@ -.: -totalt 32 -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:25 . -drwxrwxr-x 17 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 0 okt. 22 19:25 1laR.txt -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 configured-handler -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 custom-containerDescriptorHandler -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 custom-handler-withFileEntries -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 custom-handler-withMixedEntries -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 metaInf-services-aggregation -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 metaInf-spring-aggregation - -./configured-handler: -totalt 72 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:25 .. --rw-rw-r-- 1 release15 release15 44356 okt. 22 19:21 build.log --rw-rw-r-- 1 release15 release15 815 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 release15 release15 1855 okt. 22 19:14 pom.xml -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 src -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 target --rw-rw-r-- 1 release15 release15 2138 okt. 22 19:14 verify.bsh - -./configured-handler/src: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 config - -./configured-handler/src/assemble: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1394 okt. 22 19:14 bin.xml - -./configured-handler/src/config: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 a -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 b - -./configured-handler/src/config/a: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 7 okt. 22 19:14 file.txt - -./configured-handler/src/config/b: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 8 okt. 22 19:14 file.txt - -./configured-handler/target: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 archive-tmp -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 configured-handler-1-bin - -./configured-handler/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. - -./configured-handler/target/configured-handler-1-bin: -totalt 20 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 a -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 b ----------- 1 release15 release15 54 okt. 22 19:21 file.txt - -./configured-handler/target/configured-handler-1-bin/a: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. - -./configured-handler/target/configured-handler-1-bin/b: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler: -totalt 192 -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:25 .. -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 assembly --rw-rw-r-- 1 release15 release15 162471 okt. 22 19:21 build.log -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 handler-def --rw-rw-r-- 1 release15 release15 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 release15 release15 2640 okt. 22 19:14 pom.xml -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 target --rw-rw-r-- 1 release15 release15 2136 okt. 22 19:14 verify.bsh - -./custom-containerDescriptorHandler/assembly: -totalt 120 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 801 okt. 22 19:14 a.properties --rw-rw-r-- 1 release15 release15 97578 okt. 22 19:21 build.log --rw-rw-r-- 1 release15 release15 2069 okt. 22 19:14 pom.xml -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 src -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 target - -./custom-containerDescriptorHandler/assembly/src: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 config - -./custom-containerDescriptorHandler/assembly/src/assemble: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1526 okt. 22 19:14 bin.xml - -./custom-containerDescriptorHandler/assembly/src/config: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 a -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 b - -./custom-containerDescriptorHandler/assembly/src/config/a: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 7 okt. 22 19:14 file.txt - -./custom-containerDescriptorHandler/assembly/src/config/b: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 8 okt. 22 19:14 file.txt - -./custom-containerDescriptorHandler/assembly/target: -totalt 28 -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 archive-tmp -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 assembly-1-bin --rw-rw-r-- 1 release15 release15 2005 okt. 22 19:21 assembly-1.jar -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire - -./custom-containerDescriptorHandler/assembly/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/assembly/target/assembly-1-bin: -totalt 20 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 a -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 b ----------- 1 release15 release15 54 okt. 22 19:21 file.txt - -./custom-containerDescriptorHandler/assembly/target/assembly-1-bin/a: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/assembly/target/assembly-1-bin/b: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/assembly/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 98 okt. 22 19:21 pom.properties - -./custom-containerDescriptorHandler/assembly/target/surefire: -totalt 20 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1589 okt. 22 19:21 surefire1099561019163899692tmp --rw-rw-r-- 1 release15 release15 540 okt. 22 19:21 surefire8895515415338920588tmp --rw-rw-r-- 1 release15 release15 908 okt. 22 19:21 surefirebooter7545378587341722860.jar - -./custom-containerDescriptorHandler/handler-def: -totalt 24 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 3070 okt. 22 19:21 build.log --rw-rw-r-- 1 release15 release15 1396 okt. 22 19:14 pom.xml -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 src -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 target - -./custom-containerDescriptorHandler/handler-def/src: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 main - -./custom-containerDescriptorHandler/handler-def/src/main: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 resources - -./custom-containerDescriptorHandler/handler-def/src/main/resources: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 META-INF - -./custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 plexus - -./custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1295 okt. 22 19:14 components.xml - -./custom-containerDescriptorHandler/handler-def/target: -totalt 24 -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 classes --rw-rw-r-- 1 release15 release15 2768 okt. 22 19:21 handler-def-1.jar -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire - -./custom-containerDescriptorHandler/handler-def/target/classes: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 META-INF - -./custom-containerDescriptorHandler/handler-def/target/classes/META-INF: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 plexus - -./custom-containerDescriptorHandler/handler-def/target/classes/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1295 okt. 22 19:21 components.xml - -./custom-containerDescriptorHandler/handler-def/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 101 okt. 22 19:21 pom.properties - -./custom-containerDescriptorHandler/handler-def/target/surefire: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/target: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 invoker-reports - -./custom-containerDescriptorHandler/target/invoker-reports: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 138 okt. 22 19:21 BUILD-pom.xml.xml - -./custom-handler-withFileEntries: -totalt 28 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:25 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 assembly --rw-rw-r-- 1 release15 release15 0 okt. 22 19:21 build.log -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 handler-def --rw-rw-r-- 1 release15 release15 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 release15 release15 2634 okt. 22 19:14 pom.xml --rw-rw-r-- 1 release15 release15 2136 okt. 22 19:14 verify.bsh - -./custom-handler-withFileEntries/assembly: -totalt 20 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 801 okt. 22 19:14 a.properties --rw-rw-r-- 1 release15 release15 2069 okt. 22 19:14 pom.xml -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 src - -./custom-handler-withFileEntries/assembly/src: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 config - -./custom-handler-withFileEntries/assembly/src/assemble: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1702 okt. 22 19:14 bin.xml - -./custom-handler-withFileEntries/assembly/src/config: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 a -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 b - -./custom-handler-withFileEntries/assembly/src/config/a: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 7 okt. 22 19:14 file.txt - -./custom-handler-withFileEntries/assembly/src/config/b: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 8 okt. 22 19:14 file.txt - -./custom-handler-withFileEntries/handler-def: -totalt 16 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1396 okt. 22 19:14 pom.xml -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 src - -./custom-handler-withFileEntries/handler-def/src: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 main - -./custom-handler-withFileEntries/handler-def/src/main: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 resources - -./custom-handler-withFileEntries/handler-def/src/main/resources: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 META-INF - -./custom-handler-withFileEntries/handler-def/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 plexus - -./custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1294 okt. 22 19:14 components.xml - -./custom-handler-withMixedEntries: -totalt 256 -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:25 .. -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 assembly --rw-rw-r-- 1 release15 release15 229375 okt. 22 19:21 build.log -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 handler-def --rw-rw-r-- 1 release15 release15 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 release15 release15 2636 okt. 22 19:14 pom.xml -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 target --rw-rw-r-- 1 release15 release15 2136 okt. 22 19:14 verify.bsh - -./custom-handler-withMixedEntries/assembly: -totalt 120 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 801 okt. 22 19:14 a.properties --rw-rw-r-- 1 release15 release15 97792 okt. 22 19:21 build.log --rw-rw-r-- 1 release15 release15 2069 okt. 22 19:14 pom.xml -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 src -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 target - -./custom-handler-withMixedEntries/assembly/src: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 config - -./custom-handler-withMixedEntries/assembly/src/assemble: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1699 okt. 22 19:14 bin.xml - -./custom-handler-withMixedEntries/assembly/src/config: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 a -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 b - -./custom-handler-withMixedEntries/assembly/src/config/a: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 7 okt. 22 19:14 file.txt - -./custom-handler-withMixedEntries/assembly/src/config/b: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 8 okt. 22 19:14 file.txt - -./custom-handler-withMixedEntries/assembly/target: -totalt 28 -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 archive-tmp -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 assembly-1-bin --rw-rw-r-- 1 release15 release15 2005 okt. 22 19:21 assembly-1.jar -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire - -./custom-handler-withMixedEntries/assembly/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. - -./custom-handler-withMixedEntries/assembly/target/assembly-1-bin: -totalt 16 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 b ----------- 1 release15 release15 73 okt. 22 19:21 file.txt - -./custom-handler-withMixedEntries/assembly/target/assembly-1-bin/b: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. - -./custom-handler-withMixedEntries/assembly/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 98 okt. 22 19:21 pom.properties - -./custom-handler-withMixedEntries/assembly/target/surefire: -totalt 20 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 6 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1579 okt. 22 19:21 surefire203473856891319972tmp --rw-rw-r-- 1 release15 release15 536 okt. 22 19:21 surefire4496433082199856515tmp --rw-rw-r-- 1 release15 release15 904 okt. 22 19:21 surefirebooter4820842769322134005.jar - -./custom-handler-withMixedEntries/handler-def: -totalt 24 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 3060 okt. 22 19:21 build.log --rw-rw-r-- 1 release15 release15 1396 okt. 22 19:14 pom.xml -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 src -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 target - -./custom-handler-withMixedEntries/handler-def/src: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 main - -./custom-handler-withMixedEntries/handler-def/src/main: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 resources - -./custom-handler-withMixedEntries/handler-def/src/main/resources: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 META-INF - -./custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 plexus - -./custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1294 okt. 22 19:14 components.xml - -./custom-handler-withMixedEntries/handler-def/target: -totalt 24 -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 classes --rw-rw-r-- 1 release15 release15 2767 okt. 22 19:21 handler-def-1.jar -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire - -./custom-handler-withMixedEntries/handler-def/target/classes: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 META-INF - -./custom-handler-withMixedEntries/handler-def/target/classes/META-INF: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 plexus - -./custom-handler-withMixedEntries/handler-def/target/classes/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1294 okt. 22 19:21 components.xml - -./custom-handler-withMixedEntries/handler-def/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 101 okt. 22 19:21 pom.properties - -./custom-handler-withMixedEntries/handler-def/target/surefire: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. - -./custom-handler-withMixedEntries/target: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 invoker-reports - -./custom-handler-withMixedEntries/target/invoker-reports: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 137 okt. 22 19:21 BUILD-pom.xml.xml - -./metaInf-services-aggregation: -totalt 32 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:25 .. --rw-rw-r-- 1 release15 release15 345 okt. 22 19:21 build.log -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 child1 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 child2 --rw-rw-r-- 1 release15 release15 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 release15 release15 1421 okt. 22 19:14 pom.xml --rw-rw-r-- 1 release15 release15 1848 okt. 22 19:14 verify.bsh - -./metaInf-services-aggregation/child1: -totalt 16 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1197 okt. 22 19:14 pom.xml -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 src - -./metaInf-services-aggregation/child1/src: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 main -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child1/src/main: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 resources - -./metaInf-services-aggregation/child1/src/main/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child1/src/main/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 979 okt. 22 19:14 App.java - -./metaInf-services-aggregation/child1/src/main/resources: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 META-INF - -./metaInf-services-aggregation/child1/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 services - -./metaInf-services-aggregation/child1/src/main/resources/META-INF/services: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 8 okt. 22 19:14 test.Test - -./metaInf-services-aggregation/child1/src/test: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java - -./metaInf-services-aggregation/child1/src/test/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child1/src/test/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1444 okt. 22 19:14 AppTest.java - -./metaInf-services-aggregation/child2: -totalt 16 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1934 okt. 22 19:14 pom.xml -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 src - -./metaInf-services-aggregation/child2/src: -totalt 20 -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 main -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child2/src/assemble: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1634 okt. 22 19:14 bin.xml - -./metaInf-services-aggregation/child2/src/main: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 resources - -./metaInf-services-aggregation/child2/src/main/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child2/src/main/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 979 okt. 22 19:14 App.java - -./metaInf-services-aggregation/child2/src/main/resources: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 META-INF - -./metaInf-services-aggregation/child2/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 services - -./metaInf-services-aggregation/child2/src/main/resources/META-INF/services: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 8 okt. 22 19:14 test.Test - -./metaInf-services-aggregation/child2/src/test: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java - -./metaInf-services-aggregation/child2/src/test/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child2/src/test/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1444 okt. 22 19:14 AppTest.java - -./metaInf-spring-aggregation: -totalt 184 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:25 .. --rw-rw-r-- 1 release15 release15 155868 okt. 22 19:21 build.log -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 child1 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 child2 --rw-rw-r-- 1 release15 release15 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 release15 release15 1421 okt. 22 19:14 pom.xml --rw-rw-r-- 1 release15 release15 2839 okt. 22 19:14 verify.bsh - -./metaInf-spring-aggregation/child1: -totalt 20 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1197 okt. 22 19:14 pom.xml -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 src -drwxrwxr-x 7 release15 release15 4096 okt. 22 19:21 target - -./metaInf-spring-aggregation/child1/src: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 main -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child1/src/main: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 resources - -./metaInf-spring-aggregation/child1/src/main/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child1/src/main/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 979 okt. 22 19:14 App.java - -./metaInf-spring-aggregation/child1/src/main/resources: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 META-INF - -./metaInf-spring-aggregation/child1/src/main/resources/META-INF: -totalt 16 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 95 okt. 22 19:14 spring.handlers --rw-rw-r-- 1 release15 release15 112 okt. 22 19:14 spring.schemas - -./metaInf-spring-aggregation/child1/src/test: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java - -./metaInf-spring-aggregation/child1/src/test/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child1/src/test/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1444 okt. 22 19:14 AppTest.java - -./metaInf-spring-aggregation/child1/target: -totalt 32 -drwxrwxr-x 7 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 2642 okt. 22 19:21 child1-1.0-SNAPSHOT.jar -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 classes -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire-reports -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 test-classes - -./metaInf-spring-aggregation/child1/target/classes: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 7 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 META-INF -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child1/target/classes/META-INF: -totalt 16 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 95 okt. 22 19:21 spring.handlers --rw-rw-r-- 1 release15 release15 112 okt. 22 19:21 spring.schemas - -./metaInf-spring-aggregation/child1/target/classes/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 523 okt. 22 19:21 App.class - -./metaInf-spring-aggregation/child1/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 7 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 103 okt. 22 19:21 pom.properties - -./metaInf-spring-aggregation/child1/target/surefire: -totalt 20 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 7 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 661 okt. 22 19:21 surefire3487845674525729262tmp --rw-rw-r-- 1 release15 release15 1669 okt. 22 19:21 surefire6200517285381744714tmp --rw-rw-r-- 1 release15 release15 1010 okt. 22 19:21 surefirebooter9130688530404969649.jar - -./metaInf-spring-aggregation/child1/target/surefire-reports: -totalt 20 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 7 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 257 okt. 22 19:21 test.AppTest.txt --rw-rw-r-- 1 release15 release15 4660 okt. 22 19:21 TEST-test.AppTest.xml - -./metaInf-spring-aggregation/child1/target/test-classes: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 7 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child1/target/test-classes/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 588 okt. 22 19:21 AppTest.class - -./metaInf-spring-aggregation/child2: -totalt 20 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 1934 okt. 22 19:14 pom.xml -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 src -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 target - -./metaInf-spring-aggregation/child2/src: -totalt 20 -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 main -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child2/src/assemble: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1632 okt. 22 19:14 bin.xml - -./metaInf-spring-aggregation/child2/src/main: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 resources - -./metaInf-spring-aggregation/child2/src/main/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child2/src/main/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 979 okt. 22 19:14 App.java - -./metaInf-spring-aggregation/child2/src/main/resources: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 META-INF - -./metaInf-spring-aggregation/child2/src/main/resources/META-INF: -totalt 16 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 107 okt. 22 19:14 spring.handlers --rw-rw-r-- 1 release15 release15 112 okt. 22 19:14 spring.schemas - -./metaInf-spring-aggregation/child2/src/test: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 5 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 java - -./metaInf-spring-aggregation/child2/src/test/java: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child2/src/test/java/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:14 .. --rw-rw-r-- 1 release15 release15 1444 okt. 22 19:14 AppTest.java - -./metaInf-spring-aggregation/child2/target: -totalt 44 -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 archive-tmp --rw-rw-r-- 1 release15 release15 4120 okt. 22 19:21 child2-1.0-SNAPSHOT-bin.jar --rw-rw-r-- 1 release15 release15 2823 okt. 22 19:21 child2-1.0-SNAPSHOT.jar -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 classes -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 surefire-reports -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 test-classes - -./metaInf-spring-aggregation/child2/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 .. - -./metaInf-spring-aggregation/child2/target/classes: -totalt 16 -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 META-INF -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child2/target/classes/META-INF: -totalt 16 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 107 okt. 22 19:21 spring.handlers --rw-rw-r-- 1 release15 release15 112 okt. 22 19:21 spring.schemas - -./metaInf-spring-aggregation/child2/target/classes/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 4 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 523 okt. 22 19:21 App.class - -./metaInf-spring-aggregation/child2/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 103 okt. 22 19:21 pom.properties - -./metaInf-spring-aggregation/child2/target/surefire: -totalt 20 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 661 okt. 22 19:21 surefire1113332971636409001tmp --rw-rw-r-- 1 release15 release15 1842 okt. 22 19:21 surefire5018525241296158510tmp --rw-rw-r-- 1 release15 release15 1179 okt. 22 19:21 surefirebooter483582438512309650.jar - -./metaInf-spring-aggregation/child2/target/surefire-reports: -totalt 20 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 257 okt. 22 19:21 test.AppTest.txt --rw-rw-r-- 1 release15 release15 4660 okt. 22 19:21 TEST-test.AppTest.xml - -./metaInf-spring-aggregation/child2/target/test-classes: -totalt 12 -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 8 release15 release15 4096 okt. 22 19:21 .. -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child2/target/test-classes/test: -totalt 12 -drwxrwxr-x 2 release15 release15 4096 okt. 22 19:21 . -drwxrwxr-x 3 release15 release15 4096 okt. 22 19:21 .. --rw-rw-r-- 1 release15 release15 588 okt. 22 19:21 AppTest.class diff --git a/src/test/resources/1nla.txt b/src/test/resources/1nla.txt deleted file mode 100644 index 7a5a336c..00000000 --- a/src/test/resources/1nla.txt +++ /dev/null @@ -1,985 +0,0 @@ -.: -totalt 32 -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:30 . -drwxrwxr-x 17 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 0 okt. 22 19:30 1nla.txt -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 configured-handler -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 custom-containerDescriptorHandler -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 custom-handler-withFileEntries -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 custom-handler-withMixedEntries -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 metaInf-services-aggregation -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 metaInf-spring-aggregation - -./configured-handler: -totalt 72 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:30 .. --rw-rw-r-- 1 1003 1003 44356 okt. 22 19:21 build.log --rw-rw-r-- 1 1003 1003 815 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 1003 1003 1855 okt. 22 19:14 pom.xml -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 src -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 target --rw-rw-r-- 1 1003 1003 2138 okt. 22 19:14 verify.bsh - -./configured-handler/src: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 config - -./configured-handler/src/assemble: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1394 okt. 22 19:14 bin.xml - -./configured-handler/src/config: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 a -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 b - -./configured-handler/src/config/a: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 7 okt. 22 19:14 file.txt - -./configured-handler/src/config/b: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 8 okt. 22 19:14 file.txt - -./configured-handler/target: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 archive-tmp -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 configured-handler-1-bin - -./configured-handler/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. - -./configured-handler/target/configured-handler-1-bin: -totalt 20 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 a -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 b ----------- 1 1003 1003 54 okt. 22 19:21 file.txt - -./configured-handler/target/configured-handler-1-bin/a: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. - -./configured-handler/target/configured-handler-1-bin/b: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler: -totalt 192 -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:30 .. -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 assembly --rw-rw-r-- 1 1003 1003 162471 okt. 22 19:21 build.log -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 handler-def --rw-rw-r-- 1 1003 1003 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 1003 1003 2640 okt. 22 19:14 pom.xml -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 target --rw-rw-r-- 1 1003 1003 2136 okt. 22 19:14 verify.bsh - -./custom-containerDescriptorHandler/assembly: -totalt 120 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 801 okt. 22 19:14 a.properties --rw-rw-r-- 1 1003 1003 97578 okt. 22 19:21 build.log --rw-rw-r-- 1 1003 1003 2069 okt. 22 19:14 pom.xml -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 src -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 target - -./custom-containerDescriptorHandler/assembly/src: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 config - -./custom-containerDescriptorHandler/assembly/src/assemble: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1526 okt. 22 19:14 bin.xml - -./custom-containerDescriptorHandler/assembly/src/config: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 a -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 b - -./custom-containerDescriptorHandler/assembly/src/config/a: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 7 okt. 22 19:14 file.txt - -./custom-containerDescriptorHandler/assembly/src/config/b: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 8 okt. 22 19:14 file.txt - -./custom-containerDescriptorHandler/assembly/target: -totalt 28 -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 archive-tmp -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 assembly-1-bin --rw-rw-r-- 1 1003 1003 2005 okt. 22 19:21 assembly-1.jar -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire - -./custom-containerDescriptorHandler/assembly/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/assembly/target/assembly-1-bin: -totalt 20 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 a -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 b ----------- 1 1003 1003 54 okt. 22 19:21 file.txt - -./custom-containerDescriptorHandler/assembly/target/assembly-1-bin/a: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/assembly/target/assembly-1-bin/b: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/assembly/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 98 okt. 22 19:21 pom.properties - -./custom-containerDescriptorHandler/assembly/target/surefire: -totalt 20 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1589 okt. 22 19:21 surefire1099561019163899692tmp --rw-rw-r-- 1 1003 1003 540 okt. 22 19:21 surefire8895515415338920588tmp --rw-rw-r-- 1 1003 1003 908 okt. 22 19:21 surefirebooter7545378587341722860.jar - -./custom-containerDescriptorHandler/handler-def: -totalt 24 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 3070 okt. 22 19:21 build.log --rw-rw-r-- 1 1003 1003 1396 okt. 22 19:14 pom.xml -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 src -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 target - -./custom-containerDescriptorHandler/handler-def/src: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 main - -./custom-containerDescriptorHandler/handler-def/src/main: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 resources - -./custom-containerDescriptorHandler/handler-def/src/main/resources: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 META-INF - -./custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 plexus - -./custom-containerDescriptorHandler/handler-def/src/main/resources/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1295 okt. 22 19:14 components.xml - -./custom-containerDescriptorHandler/handler-def/target: -totalt 24 -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 classes --rw-rw-r-- 1 1003 1003 2768 okt. 22 19:21 handler-def-1.jar -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire - -./custom-containerDescriptorHandler/handler-def/target/classes: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 META-INF - -./custom-containerDescriptorHandler/handler-def/target/classes/META-INF: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 plexus - -./custom-containerDescriptorHandler/handler-def/target/classes/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1295 okt. 22 19:21 components.xml - -./custom-containerDescriptorHandler/handler-def/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 101 okt. 22 19:21 pom.properties - -./custom-containerDescriptorHandler/handler-def/target/surefire: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. - -./custom-containerDescriptorHandler/target: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 invoker-reports - -./custom-containerDescriptorHandler/target/invoker-reports: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 138 okt. 22 19:21 BUILD-pom.xml.xml - -./custom-handler-withFileEntries: -totalt 28 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:30 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 assembly --rw-rw-r-- 1 1003 1003 0 okt. 22 19:21 build.log -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 handler-def --rw-rw-r-- 1 1003 1003 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 1003 1003 2634 okt. 22 19:14 pom.xml --rw-rw-r-- 1 1003 1003 2136 okt. 22 19:14 verify.bsh - -./custom-handler-withFileEntries/assembly: -totalt 20 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 801 okt. 22 19:14 a.properties --rw-rw-r-- 1 1003 1003 2069 okt. 22 19:14 pom.xml -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 src - -./custom-handler-withFileEntries/assembly/src: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 config - -./custom-handler-withFileEntries/assembly/src/assemble: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1702 okt. 22 19:14 bin.xml - -./custom-handler-withFileEntries/assembly/src/config: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 a -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 b - -./custom-handler-withFileEntries/assembly/src/config/a: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 7 okt. 22 19:14 file.txt - -./custom-handler-withFileEntries/assembly/src/config/b: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 8 okt. 22 19:14 file.txt - -./custom-handler-withFileEntries/handler-def: -totalt 16 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1396 okt. 22 19:14 pom.xml -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 src - -./custom-handler-withFileEntries/handler-def/src: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 main - -./custom-handler-withFileEntries/handler-def/src/main: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 resources - -./custom-handler-withFileEntries/handler-def/src/main/resources: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 META-INF - -./custom-handler-withFileEntries/handler-def/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 plexus - -./custom-handler-withFileEntries/handler-def/src/main/resources/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1294 okt. 22 19:14 components.xml - -./custom-handler-withMixedEntries: -totalt 256 -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:30 .. -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 assembly --rw-rw-r-- 1 1003 1003 229375 okt. 22 19:21 build.log -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 handler-def --rw-rw-r-- 1 1003 1003 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 1003 1003 2636 okt. 22 19:14 pom.xml -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 target --rw-rw-r-- 1 1003 1003 2136 okt. 22 19:14 verify.bsh - -./custom-handler-withMixedEntries/assembly: -totalt 120 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 801 okt. 22 19:14 a.properties --rw-rw-r-- 1 1003 1003 97792 okt. 22 19:21 build.log --rw-rw-r-- 1 1003 1003 2069 okt. 22 19:14 pom.xml -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 src -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 target - -./custom-handler-withMixedEntries/assembly/src: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 config - -./custom-handler-withMixedEntries/assembly/src/assemble: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1699 okt. 22 19:14 bin.xml - -./custom-handler-withMixedEntries/assembly/src/config: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 a -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 b - -./custom-handler-withMixedEntries/assembly/src/config/a: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 7 okt. 22 19:14 file.txt - -./custom-handler-withMixedEntries/assembly/src/config/b: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 8 okt. 22 19:14 file.txt - -./custom-handler-withMixedEntries/assembly/target: -totalt 28 -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 archive-tmp -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 assembly-1-bin --rw-rw-r-- 1 1003 1003 2005 okt. 22 19:21 assembly-1.jar -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire - -./custom-handler-withMixedEntries/assembly/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. - -./custom-handler-withMixedEntries/assembly/target/assembly-1-bin: -totalt 16 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 b ----------- 1 1003 1003 73 okt. 22 19:21 file.txt - -./custom-handler-withMixedEntries/assembly/target/assembly-1-bin/b: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. - -./custom-handler-withMixedEntries/assembly/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 98 okt. 22 19:21 pom.properties - -./custom-handler-withMixedEntries/assembly/target/surefire: -totalt 20 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 6 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1579 okt. 22 19:21 surefire203473856891319972tmp --rw-rw-r-- 1 1003 1003 536 okt. 22 19:21 surefire4496433082199856515tmp --rw-rw-r-- 1 1003 1003 904 okt. 22 19:21 surefirebooter4820842769322134005.jar - -./custom-handler-withMixedEntries/handler-def: -totalt 24 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 3060 okt. 22 19:21 build.log --rw-rw-r-- 1 1003 1003 1396 okt. 22 19:14 pom.xml -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 src -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 target - -./custom-handler-withMixedEntries/handler-def/src: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 main - -./custom-handler-withMixedEntries/handler-def/src/main: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 resources - -./custom-handler-withMixedEntries/handler-def/src/main/resources: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 META-INF - -./custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 plexus - -./custom-handler-withMixedEntries/handler-def/src/main/resources/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1294 okt. 22 19:14 components.xml - -./custom-handler-withMixedEntries/handler-def/target: -totalt 24 -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 classes --rw-rw-r-- 1 1003 1003 2767 okt. 22 19:21 handler-def-1.jar -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire - -./custom-handler-withMixedEntries/handler-def/target/classes: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 META-INF - -./custom-handler-withMixedEntries/handler-def/target/classes/META-INF: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 plexus - -./custom-handler-withMixedEntries/handler-def/target/classes/META-INF/plexus: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1294 okt. 22 19:21 components.xml - -./custom-handler-withMixedEntries/handler-def/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 101 okt. 22 19:21 pom.properties - -./custom-handler-withMixedEntries/handler-def/target/surefire: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. - -./custom-handler-withMixedEntries/target: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 invoker-reports - -./custom-handler-withMixedEntries/target/invoker-reports: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 137 okt. 22 19:21 BUILD-pom.xml.xml - -./metaInf-services-aggregation: -totalt 32 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:30 .. --rw-rw-r-- 1 1003 1003 345 okt. 22 19:21 build.log -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 child1 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 child2 --rw-rw-r-- 1 1003 1003 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 1003 1003 1421 okt. 22 19:14 pom.xml --rw-rw-r-- 1 1003 1003 1848 okt. 22 19:14 verify.bsh - -./metaInf-services-aggregation/child1: -totalt 16 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1197 okt. 22 19:14 pom.xml -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 src - -./metaInf-services-aggregation/child1/src: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 main -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child1/src/main: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 resources - -./metaInf-services-aggregation/child1/src/main/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child1/src/main/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 979 okt. 22 19:14 App.java - -./metaInf-services-aggregation/child1/src/main/resources: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 META-INF - -./metaInf-services-aggregation/child1/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 services - -./metaInf-services-aggregation/child1/src/main/resources/META-INF/services: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 8 okt. 22 19:14 test.Test - -./metaInf-services-aggregation/child1/src/test: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java - -./metaInf-services-aggregation/child1/src/test/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child1/src/test/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1444 okt. 22 19:14 AppTest.java - -./metaInf-services-aggregation/child2: -totalt 16 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1934 okt. 22 19:14 pom.xml -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 src - -./metaInf-services-aggregation/child2/src: -totalt 20 -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 main -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child2/src/assemble: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1634 okt. 22 19:14 bin.xml - -./metaInf-services-aggregation/child2/src/main: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 resources - -./metaInf-services-aggregation/child2/src/main/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child2/src/main/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 979 okt. 22 19:14 App.java - -./metaInf-services-aggregation/child2/src/main/resources: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 META-INF - -./metaInf-services-aggregation/child2/src/main/resources/META-INF: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 services - -./metaInf-services-aggregation/child2/src/main/resources/META-INF/services: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 8 okt. 22 19:14 test.Test - -./metaInf-services-aggregation/child2/src/test: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java - -./metaInf-services-aggregation/child2/src/test/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-services-aggregation/child2/src/test/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1444 okt. 22 19:14 AppTest.java - -./metaInf-spring-aggregation: -totalt 184 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:30 .. --rw-rw-r-- 1 1003 1003 155868 okt. 22 19:21 build.log -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 child1 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 child2 --rw-rw-r-- 1 1003 1003 808 okt. 22 19:14 invoker.properties --rw-rw-r-- 1 1003 1003 1421 okt. 22 19:14 pom.xml --rw-rw-r-- 1 1003 1003 2839 okt. 22 19:14 verify.bsh - -./metaInf-spring-aggregation/child1: -totalt 20 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1197 okt. 22 19:14 pom.xml -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 src -drwxrwxr-x 7 1003 1003 4096 okt. 22 19:21 target - -./metaInf-spring-aggregation/child1/src: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 main -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child1/src/main: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 resources - -./metaInf-spring-aggregation/child1/src/main/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child1/src/main/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 979 okt. 22 19:14 App.java - -./metaInf-spring-aggregation/child1/src/main/resources: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 META-INF - -./metaInf-spring-aggregation/child1/src/main/resources/META-INF: -totalt 16 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 95 okt. 22 19:14 spring.handlers --rw-rw-r-- 1 1003 1003 112 okt. 22 19:14 spring.schemas - -./metaInf-spring-aggregation/child1/src/test: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java - -./metaInf-spring-aggregation/child1/src/test/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child1/src/test/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1444 okt. 22 19:14 AppTest.java - -./metaInf-spring-aggregation/child1/target: -totalt 32 -drwxrwxr-x 7 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 2642 okt. 22 19:21 child1-1.0-SNAPSHOT.jar -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 classes -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire-reports -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 test-classes - -./metaInf-spring-aggregation/child1/target/classes: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 7 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 META-INF -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child1/target/classes/META-INF: -totalt 16 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 95 okt. 22 19:21 spring.handlers --rw-rw-r-- 1 1003 1003 112 okt. 22 19:21 spring.schemas - -./metaInf-spring-aggregation/child1/target/classes/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 523 okt. 22 19:21 App.class - -./metaInf-spring-aggregation/child1/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 7 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 103 okt. 22 19:21 pom.properties - -./metaInf-spring-aggregation/child1/target/surefire: -totalt 20 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 7 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 661 okt. 22 19:21 surefire3487845674525729262tmp --rw-rw-r-- 1 1003 1003 1669 okt. 22 19:21 surefire6200517285381744714tmp --rw-rw-r-- 1 1003 1003 1010 okt. 22 19:21 surefirebooter9130688530404969649.jar - -./metaInf-spring-aggregation/child1/target/surefire-reports: -totalt 20 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 7 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 257 okt. 22 19:21 test.AppTest.txt --rw-rw-r-- 1 1003 1003 4660 okt. 22 19:21 TEST-test.AppTest.xml - -./metaInf-spring-aggregation/child1/target/test-classes: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 7 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child1/target/test-classes/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 588 okt. 22 19:21 AppTest.class - -./metaInf-spring-aggregation/child2: -totalt 20 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 1934 okt. 22 19:14 pom.xml -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 src -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 target - -./metaInf-spring-aggregation/child2/src: -totalt 20 -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 assemble -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 main -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child2/src/assemble: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1632 okt. 22 19:14 bin.xml - -./metaInf-spring-aggregation/child2/src/main: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 resources - -./metaInf-spring-aggregation/child2/src/main/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child2/src/main/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 979 okt. 22 19:14 App.java - -./metaInf-spring-aggregation/child2/src/main/resources: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 META-INF - -./metaInf-spring-aggregation/child2/src/main/resources/META-INF: -totalt 16 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 107 okt. 22 19:14 spring.handlers --rw-rw-r-- 1 1003 1003 112 okt. 22 19:14 spring.schemas - -./metaInf-spring-aggregation/child2/src/test: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 5 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 java - -./metaInf-spring-aggregation/child2/src/test/java: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 test - -./metaInf-spring-aggregation/child2/src/test/java/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:14 .. --rw-rw-r-- 1 1003 1003 1444 okt. 22 19:14 AppTest.java - -./metaInf-spring-aggregation/child2/target: -totalt 44 -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 archive-tmp --rw-rw-r-- 1 1003 1003 4120 okt. 22 19:21 child2-1.0-SNAPSHOT-bin.jar --rw-rw-r-- 1 1003 1003 2823 okt. 22 19:21 child2-1.0-SNAPSHOT.jar -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 classes -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 maven-archiver -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 surefire-reports -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 test-classes - -./metaInf-spring-aggregation/child2/target/archive-tmp: -totalt 8 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 .. - -./metaInf-spring-aggregation/child2/target/classes: -totalt 16 -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 META-INF -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child2/target/classes/META-INF: -totalt 16 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 107 okt. 22 19:21 spring.handlers --rw-rw-r-- 1 1003 1003 112 okt. 22 19:21 spring.schemas - -./metaInf-spring-aggregation/child2/target/classes/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 4 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 523 okt. 22 19:21 App.class - -./metaInf-spring-aggregation/child2/target/maven-archiver: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 103 okt. 22 19:21 pom.properties - -./metaInf-spring-aggregation/child2/target/surefire: -totalt 20 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 661 okt. 22 19:21 surefire1113332971636409001tmp --rw-rw-r-- 1 1003 1003 1842 okt. 22 19:21 surefire5018525241296158510tmp --rw-rw-r-- 1 1003 1003 1179 okt. 22 19:21 surefirebooter483582438512309650.jar - -./metaInf-spring-aggregation/child2/target/surefire-reports: -totalt 20 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 257 okt. 22 19:21 test.AppTest.txt --rw-rw-r-- 1 1003 1003 4660 okt. 22 19:21 TEST-test.AppTest.xml - -./metaInf-spring-aggregation/child2/target/test-classes: -totalt 12 -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 8 1003 1003 4096 okt. 22 19:21 .. -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 test - -./metaInf-spring-aggregation/child2/target/test-classes/test: -totalt 12 -drwxrwxr-x 2 1003 1003 4096 okt. 22 19:21 . -drwxrwxr-x 3 1003 1003 4096 okt. 22 19:21 .. --rw-rw-r-- 1 1003 1003 588 okt. 22 19:21 AppTest.class diff --git a/src/test/resources/CYGWIN_NT-5.1-p1.txt b/src/test/resources/CYGWIN_NT-5.1-p1.txt deleted file mode 100644 index e04558c3..00000000 --- a/src/test/resources/CYGWIN_NT-5.1-p1.txt +++ /dev/null @@ -1,77 +0,0 @@ -src/main/java/org/codehaus/plexus/components: -total 0 -drwxr-xr-x+ 3 203222 10513 0 Apr 21 08:49 . -drwxr-xr-x+ 3 203222 10513 0 Apr 21 08:49 .. -drwxr-xr-x+ 6 203222 10513 0 Apr 21 08:49 io - -src/main/java/org/codehaus/plexus/components/io: -total 0 -drwxr-xr-x+ 6 203222 10513 0 Apr 21 08:49 . -drwxr-xr-x+ 3 203222 10513 0 Apr 21 08:49 .. -drwxr-xr-x+ 2 203222 10513 0 Apr 23 08:24 attributes -drwxr-xr-x+ 2 203222 10513 0 Apr 21 08:49 filemappers -drwxr-xr-x+ 2 203222 10513 0 Apr 21 08:49 fileselectors -drwxr-xr-x+ 3 203222 10513 0 Apr 21 08:49 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -total 48 -drwxr-xr-x+ 2 203222 10513 0 Apr 23 08:24 . -drwxr-xr-x+ 6 203222 10513 0 Apr 21 08:49 .. --rw-r--r-- 1 203222 10513 1242 Apr 21 08:49 AttributeConstants.java --rw-r--r-- 1 203222 10513 9565 Apr 21 08:49 FileAttributes.java --rw-r--r-- 1 203222 10513 17872 Apr 23 08:24 PlexusIoResourceAttributeUtils.java --rw-r--r-- 1 203222 10513 2179 Apr 21 08:49 PlexusIoResourceAttributes.java --rw-r--r-- 1 203222 10513 5266 Apr 21 08:49 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -total 36 -drwxr-xr-x+ 2 203222 10513 0 Apr 21 08:49 . -drwxr-xr-x+ 6 203222 10513 0 Apr 21 08:49 .. --rw-r--r-- 1 203222 10513 1293 Apr 21 08:49 AbstractFileMapper.java --rw-r--r-- 1 203222 10513 2516 Apr 21 08:49 FileExtensionMapper.java --rw-r--r-- 1 203222 10513 1358 Apr 21 08:49 FileMapper.java --rw-r--r-- 1 203222 10513 1384 Apr 21 08:49 FlattenFileMapper.java --rw-r--r-- 1 203222 10513 1216 Apr 21 08:49 IdentityMapper.java --rw-r--r-- 1 203222 10513 2013 Apr 21 08:49 MergeFileMapper.java --rw-r--r-- 1 203222 10513 1665 Apr 21 08:49 PrefixFileMapper.java --rw-r--r-- 1 203222 10513 2497 Apr 21 08:49 RegExpFileMapper.java --rw-r--r-- 1 203222 10513 877 Apr 21 08:49 package.html - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -total 24 -drwxr-xr-x+ 2 203222 10513 0 Apr 21 08:49 . -drwxr-xr-x+ 6 203222 10513 0 Apr 21 08:49 .. --rw-r--r-- 1 203222 10513 1035 Apr 21 08:49 AllFilesFileSelector.java --rw-r--r-- 1 203222 10513 1761 Apr 21 08:49 FileInfo.java --rw-r--r-- 1 203222 10513 1377 Apr 21 08:49 FileSelector.java --rw-r--r-- 1 203222 10513 8145 Apr 21 08:49 IncludeExcludeFileSelector.java --rw-r--r-- 1 203222 10513 616 Apr 21 08:49 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -total 65 -drwxr-xr-x+ 3 203222 10513 0 Apr 21 08:49 . -drwxr-xr-x+ 6 203222 10513 0 Apr 21 08:49 .. --rw-r--r-- 1 203222 10513 2277 Apr 21 08:49 AbstractPlexusIoArchiveResourceCollection.java --rw-r--r-- 1 203222 10513 2884 Apr 21 08:49 AbstractPlexusIoResource.java --rw-r--r-- 1 203222 10513 6776 Apr 21 08:49 AbstractPlexusIoResourceCollection.java --rw-r--r-- 1 203222 10513 1243 Apr 21 08:49 AbstractPlexusIoResourceWithAttributes.java --rw-r--r-- 1 203222 10513 1542 Apr 21 08:49 PlexusIOResourceCollectionWithAttributes.java --rw-r--r-- 1 203222 10513 1042 Apr 21 08:49 PlexusIoArchivedResourceCollection.java --rw-r--r-- 1 203222 10513 2980 Apr 21 08:49 PlexusIoCompressedFileResourceCollection.java --rw-r--r-- 1 203222 10513 3355 Apr 21 08:49 PlexusIoFileResource.java --rw-r--r-- 1 203222 10513 6054 Apr 21 08:49 PlexusIoFileResourceCollection.java --rw-r--r-- 1 203222 10513 1911 Apr 21 08:49 PlexusIoResource.java --rw-r--r-- 1 203222 10513 2127 Apr 21 08:49 PlexusIoResourceCollection.java --rw-r--r-- 1 203222 10513 949 Apr 21 08:49 PlexusIoResourceWithAttributes.java --rw-r--r-- 1 203222 10513 1089 Apr 21 08:49 PlexusIoURLResource.java --rw-r--r-- 1 203222 10513 2856 Apr 21 08:49 PlexusIoZipFileResourceCollection.java --rw-r--r-- 1 203222 10513 534 Apr 21 08:49 package.html -drwxr-xr-x+ 2 203222 10513 0 Apr 21 08:49 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -total 16 -drwxr-xr-x+ 2 203222 10513 0 Apr 21 08:49 . -drwxr-xr-x+ 3 203222 10513 0 Apr 21 08:49 .. --rw-r--r-- 1 203222 10513 1753 Apr 21 08:49 PlexusIoProxyResource.java --rw-r--r-- 1 203222 10513 6701 Apr 21 08:49 PlexusIoProxyResourceCollection.java --rw-r--r-- 1 203222 10513 1897 Apr 21 08:49 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/CYGWIN_NT-5.1-p2.txt b/src/test/resources/CYGWIN_NT-5.1-p2.txt deleted file mode 100644 index c241992e..00000000 --- a/src/test/resources/CYGWIN_NT-5.1-p2.txt +++ /dev/null @@ -1,77 +0,0 @@ -src/main/java/org/codehaus/plexus/components: -total 0 -drwxr-xr-x+ 3 x575722 Domain Users 0 Apr 21 08:49 . -drwxr-xr-x+ 3 x575722 Domain Users 0 Apr 21 08:49 .. -drwxr-xr-x+ 6 x575722 Domain Users 0 Apr 21 08:49 io - -src/main/java/org/codehaus/plexus/components/io: -total 0 -drwxr-xr-x+ 6 x575722 Domain Users 0 Apr 21 08:49 . -drwxr-xr-x+ 3 x575722 Domain Users 0 Apr 21 08:49 .. -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 23 08:24 attributes -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 21 08:49 filemappers -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 21 08:49 fileselectors -drwxr-xr-x+ 3 x575722 Domain Users 0 Apr 21 08:49 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -total 48 -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 23 08:24 . -drwxr-xr-x+ 6 x575722 Domain Users 0 Apr 21 08:49 .. --rw-r--r-- 1 x575722 Domain Users 1242 Apr 21 08:49 AttributeConstants.java --rw-r--r-- 1 x575722 Domain Users 9565 Apr 21 08:49 FileAttributes.java --rw-r--r-- 1 x575722 Domain Users 17872 Apr 23 08:24 PlexusIoResourceAttributeUtils.java --rw-r--r-- 1 x575722 Domain Users 2179 Apr 21 08:49 PlexusIoResourceAttributes.java --rw-r--r-- 1 x575722 Domain Users 5266 Apr 21 08:49 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -total 36 -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 21 08:49 . -drwxr-xr-x+ 6 x575722 Domain Users 0 Apr 21 08:49 .. --rw-r--r-- 1 x575722 Domain Users 1293 Apr 21 08:49 AbstractFileMapper.java --rw-r--r-- 1 x575722 Domain Users 2516 Apr 21 08:49 FileExtensionMapper.java --rw-r--r-- 1 x575722 Domain Users 1358 Apr 21 08:49 FileMapper.java --rw-r--r-- 1 x575722 Domain Users 1384 Apr 21 08:49 FlattenFileMapper.java --rw-r--r-- 1 x575722 Domain Users 1216 Apr 21 08:49 IdentityMapper.java --rw-r--r-- 1 x575722 Domain Users 2013 Apr 21 08:49 MergeFileMapper.java --rw-r--r-- 1 x575722 Domain Users 1665 Apr 21 08:49 PrefixFileMapper.java --rw-r--r-- 1 x575722 Domain Users 2497 Apr 21 08:49 RegExpFileMapper.java --rw-r--r-- 1 x575722 Domain Users 877 Apr 21 08:49 package.html - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -total 24 -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 21 08:49 . -drwxr-xr-x+ 6 x575722 Domain Users 0 Apr 21 08:49 .. --rw-r--r-- 1 x575722 Domain Users 1035 Apr 21 08:49 AllFilesFileSelector.java --rw-r--r-- 1 x575722 Domain Users 1761 Apr 21 08:49 FileInfo.java --rw-r--r-- 1 x575722 Domain Users 1377 Apr 21 08:49 FileSelector.java --rw-r--r-- 1 x575722 Domain Users 8145 Apr 21 08:49 IncludeExcludeFileSelector.java --rw-r--r-- 1 x575722 Domain Users 616 Apr 21 08:49 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -total 65 -drwxr-xr-x+ 3 x575722 Domain Users 0 Apr 21 08:49 . -drwxr-xr-x+ 6 x575722 Domain Users 0 Apr 21 08:49 .. --rw-r--r-- 1 x575722 Domain Users 2277 Apr 21 08:49 AbstractPlexusIoArchiveResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 2884 Apr 21 08:49 AbstractPlexusIoResource.java --rw-r--r-- 1 x575722 Domain Users 6776 Apr 21 08:49 AbstractPlexusIoResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 1243 Apr 21 08:49 AbstractPlexusIoResourceWithAttributes.java --rw-r--r-- 1 x575722 Domain Users 1542 Apr 21 08:49 PlexusIOResourceCollectionWithAttributes.java --rw-r--r-- 1 x575722 Domain Users 1042 Apr 21 08:49 PlexusIoArchivedResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 2980 Apr 21 08:49 PlexusIoCompressedFileResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 3355 Apr 21 08:49 PlexusIoFileResource.java --rw-r--r-- 1 x575722 Domain Users 6054 Apr 21 08:49 PlexusIoFileResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 1911 Apr 21 08:49 PlexusIoResource.java --rw-r--r-- 1 x575722 Domain Users 2127 Apr 21 08:49 PlexusIoResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 949 Apr 21 08:49 PlexusIoResourceWithAttributes.java --rw-r--r-- 1 x575722 Domain Users 1089 Apr 21 08:49 PlexusIoURLResource.java --rw-r--r-- 1 x575722 Domain Users 2856 Apr 21 08:49 PlexusIoZipFileResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 534 Apr 21 08:49 package.html -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 21 08:49 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -total 16 -drwxr-xr-x+ 2 x575722 Domain Users 0 Apr 21 08:49 . -drwxr-xr-x+ 3 x575722 Domain Users 0 Apr 21 08:49 .. --rw-r--r-- 1 x575722 Domain Users 1753 Apr 21 08:49 PlexusIoProxyResource.java --rw-r--r-- 1 x575722 Domain Users 6701 Apr 21 08:49 PlexusIoProxyResourceCollection.java --rw-r--r-- 1 x575722 Domain Users 1897 Apr 21 08:49 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/FreeBSD-p1.txt b/src/test/resources/FreeBSD-p1.txt deleted file mode 100644 index 0f298f0e..00000000 --- a/src/test/resources/FreeBSD-p1.txt +++ /dev/null @@ -1,76 +0,0 @@ -total 2 -drwxr-xr-x 3 3391 3391 3 Apr 23 06:57 . -drwxr-xr-x 3 3391 3391 3 Apr 23 06:57 .. -drwxr-xr-x 6 3391 3391 6 Apr 23 06:57 io - -src/main/java/org/codehaus/plexus/components/io: -total 3 -drwxr-xr-x 6 3391 3391 6 Apr 23 06:57 . -drwxr-xr-x 3 3391 3391 3 Apr 23 06:57 .. -drwxr-xr-x 2 3391 3391 7 Apr 23 06:57 attributes -drwxr-xr-x 2 3391 3391 11 Apr 23 06:57 filemappers -drwxr-xr-x 2 3391 3391 7 Apr 23 06:57 fileselectors -drwxr-xr-x 3 3391 3391 18 Apr 23 06:57 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -total 4 -drwxr-xr-x 2 3391 3391 7 Apr 23 06:57 . -drwxr-xr-x 6 3391 3391 6 Apr 23 06:57 .. --rw-r--r-- 1 3391 3391 1242 Apr 23 06:57 AttributeConstants.java --rw-r--r-- 1 3391 3391 9565 Apr 23 06:57 FileAttributes.java --rw-r--r-- 1 3391 3391 17872 Apr 23 06:57 PlexusIoResourceAttributeUtils.java --rw-r--r-- 1 3391 3391 2179 Apr 23 06:57 PlexusIoResourceAttributes.java --rw-r--r-- 1 3391 3391 5266 Apr 23 06:57 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -total 6 -drwxr-xr-x 2 3391 3391 11 Apr 23 06:57 . -drwxr-xr-x 6 3391 3391 6 Apr 23 06:57 .. --rw-r--r-- 1 3391 3391 1293 Apr 23 06:57 AbstractFileMapper.java --rw-r--r-- 1 3391 3391 2516 Apr 23 06:57 FileExtensionMapper.java --rw-r--r-- 1 3391 3391 1358 Apr 23 06:57 FileMapper.java --rw-r--r-- 1 3391 3391 1384 Apr 23 06:57 FlattenFileMapper.java --rw-r--r-- 1 3391 3391 1216 Apr 23 06:57 IdentityMapper.java --rw-r--r-- 1 3391 3391 2013 Apr 23 06:57 MergeFileMapper.java --rw-r--r-- 1 3391 3391 1665 Apr 23 06:57 PrefixFileMapper.java --rw-r--r-- 1 3391 3391 2497 Apr 23 06:57 RegExpFileMapper.java --rw-r--r-- 1 3391 3391 877 Apr 23 06:57 package.html - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -total 4 -drwxr-xr-x 2 3391 3391 7 Apr 23 06:57 . -drwxr-xr-x 6 3391 3391 6 Apr 23 06:57 .. --rw-r--r-- 1 3391 3391 1035 Apr 23 06:57 AllFilesFileSelector.java --rw-r--r-- 1 3391 3391 1761 Apr 23 06:57 FileInfo.java --rw-r--r-- 1 3391 3391 1377 Apr 23 06:57 FileSelector.java --rw-r--r-- 1 3391 3391 8145 Apr 23 06:57 IncludeExcludeFileSelector.java --rw-r--r-- 1 3391 3391 616 Apr 23 06:57 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -total 9 -drwxr-xr-x 3 3391 3391 18 Apr 23 06:57 . -drwxr-xr-x 6 3391 3391 6 Apr 23 06:57 .. --rw-r--r-- 1 3391 3391 2277 Apr 23 06:57 AbstractPlexusIoArchiveResourceCollection.java --rw-r--r-- 1 3391 3391 2884 Apr 23 06:57 AbstractPlexusIoResource.java --rw-r--r-- 1 3391 3391 6776 Apr 23 06:57 AbstractPlexusIoResourceCollection.java --rw-r--r-- 1 3391 3391 1243 Apr 23 06:57 AbstractPlexusIoResourceWithAttributes.java --rw-r--r-- 1 3391 3391 1542 Apr 23 06:57 PlexusIOResourceCollectionWithAttributes.java --rw-r--r-- 1 3391 3391 1042 Apr 23 06:57 PlexusIoArchivedResourceCollection.java --rw-r--r-- 1 3391 3391 2980 Apr 23 06:57 PlexusIoCompressedFileResourceCollection.java --rw-r--r-- 1 3391 3391 3355 Apr 23 06:57 PlexusIoFileResource.java --rw-r--r-- 1 3391 3391 6054 Apr 23 06:57 PlexusIoFileResourceCollection.java --rw-r--r-- 1 3391 3391 1911 Apr 23 06:57 PlexusIoResource.java --rw-r--r-- 1 3391 3391 2127 Apr 23 06:57 PlexusIoResourceCollection.java --rw-r--r-- 1 3391 3391 949 Apr 23 06:57 PlexusIoResourceWithAttributes.java --rw-r--r-- 1 3391 3391 1089 Apr 23 06:57 PlexusIoURLResource.java --rw-r--r-- 1 3391 3391 2856 Apr 23 06:57 PlexusIoZipFileResourceCollection.java --rw-r--r-- 1 3391 3391 534 Apr 23 06:57 package.html -drwxr-xr-x 2 3391 3391 5 Apr 23 06:57 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -total 3 -drwxr-xr-x 2 3391 3391 5 Apr 23 06:57 . -drwxr-xr-x 3 3391 3391 18 Apr 23 06:57 .. --rw-r--r-- 1 3391 3391 1753 Apr 23 06:57 PlexusIoProxyResource.java --rw-r--r-- 1 3391 3391 6701 Apr 23 06:57 PlexusIoProxyResourceCollection.java --rw-r--r-- 1 3391 3391 1897 Apr 23 06:57 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/FreeBSD-p2.txt b/src/test/resources/FreeBSD-p2.txt deleted file mode 100644 index 92e3a766..00000000 --- a/src/test/resources/FreeBSD-p2.txt +++ /dev/null @@ -1,76 +0,0 @@ -total 9 -drwxr-xr-x 3 krosenvold krosenvold 3 Apr 23 06:57 . -drwxr-xr-x 3 krosenvold krosenvold 3 Apr 23 06:57 .. -drwxr-xr-x 6 krosenvold krosenvold 6 Apr 23 06:57 io - -src/main/java/org/codehaus/plexus/components/io: -total 18 -drwxr-xr-x 6 krosenvold krosenvold 6 Apr 23 06:57 . -drwxr-xr-x 3 krosenvold krosenvold 3 Apr 23 06:57 .. -drwxr-xr-x 2 krosenvold krosenvold 7 Apr 23 06:57 attributes -drwxr-xr-x 2 krosenvold krosenvold 11 Apr 23 06:57 filemappers -drwxr-xr-x 2 krosenvold krosenvold 7 Apr 23 06:57 fileselectors -drwxr-xr-x 3 krosenvold krosenvold 18 Apr 23 06:57 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -total 50 -drwxr-xr-x 2 krosenvold krosenvold 7 Apr 23 06:57 . -drwxr-xr-x 6 krosenvold krosenvold 6 Apr 23 06:57 .. --rw-r--r-- 1 krosenvold krosenvold 1242 Apr 23 06:57 AttributeConstants.java --rw-r--r-- 1 krosenvold krosenvold 9565 Apr 23 06:57 FileAttributes.java --rw-r--r-- 1 krosenvold krosenvold 17872 Apr 23 06:57 PlexusIoResourceAttributeUtils.java --rw-r--r-- 1 krosenvold krosenvold 2179 Apr 23 06:57 PlexusIoResourceAttributes.java --rw-r--r-- 1 krosenvold krosenvold 5266 Apr 23 06:57 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -total 36 -drwxr-xr-x 2 krosenvold krosenvold 11 Apr 23 06:57 . -drwxr-xr-x 6 krosenvold krosenvold 6 Apr 23 06:57 .. --rw-r--r-- 1 krosenvold krosenvold 1293 Apr 23 06:57 AbstractFileMapper.java --rw-r--r-- 1 krosenvold krosenvold 2516 Apr 23 06:57 FileExtensionMapper.java --rw-r--r-- 1 krosenvold krosenvold 1358 Apr 23 06:57 FileMapper.java --rw-r--r-- 1 krosenvold krosenvold 1384 Apr 23 06:57 FlattenFileMapper.java --rw-r--r-- 1 krosenvold krosenvold 1216 Apr 23 06:57 IdentityMapper.java --rw-r--r-- 1 krosenvold krosenvold 2013 Apr 23 06:57 MergeFileMapper.java --rw-r--r-- 1 krosenvold krosenvold 1665 Apr 23 06:57 PrefixFileMapper.java --rw-r--r-- 1 krosenvold krosenvold 2497 Apr 23 06:57 RegExpFileMapper.java --rw-r--r-- 1 krosenvold krosenvold 877 Apr 23 06:57 package.html - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -total 28 -drwxr-xr-x 2 krosenvold krosenvold 7 Apr 23 06:57 . -drwxr-xr-x 6 krosenvold krosenvold 6 Apr 23 06:57 .. --rw-r--r-- 1 krosenvold krosenvold 1035 Apr 23 06:57 AllFilesFileSelector.java --rw-r--r-- 1 krosenvold krosenvold 1761 Apr 23 06:57 FileInfo.java --rw-r--r-- 1 krosenvold krosenvold 1377 Apr 23 06:57 FileSelector.java --rw-r--r-- 1 krosenvold krosenvold 8145 Apr 23 06:57 IncludeExcludeFileSelector.java --rw-r--r-- 1 krosenvold krosenvold 616 Apr 23 06:57 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -total 72 -drwxr-xr-x 3 krosenvold krosenvold 18 Apr 23 06:57 . -drwxr-xr-x 6 krosenvold krosenvold 6 Apr 23 06:57 .. --rw-r--r-- 1 krosenvold krosenvold 2277 Apr 23 06:57 AbstractPlexusIoArchiveResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 2884 Apr 23 06:57 AbstractPlexusIoResource.java --rw-r--r-- 1 krosenvold krosenvold 6776 Apr 23 06:57 AbstractPlexusIoResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 1243 Apr 23 06:57 AbstractPlexusIoResourceWithAttributes.java --rw-r--r-- 1 krosenvold krosenvold 1542 Apr 23 06:57 PlexusIOResourceCollectionWithAttributes.java --rw-r--r-- 1 krosenvold krosenvold 1042 Apr 23 06:57 PlexusIoArchivedResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 2980 Apr 23 06:57 PlexusIoCompressedFileResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 3355 Apr 23 06:57 PlexusIoFileResource.java --rw-r--r-- 1 krosenvold krosenvold 6054 Apr 23 06:57 PlexusIoFileResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 1911 Apr 23 06:57 PlexusIoResource.java --rw-r--r-- 1 krosenvold krosenvold 2127 Apr 23 06:57 PlexusIoResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 949 Apr 23 06:57 PlexusIoResourceWithAttributes.java --rw-r--r-- 1 krosenvold krosenvold 1089 Apr 23 06:57 PlexusIoURLResource.java --rw-r--r-- 1 krosenvold krosenvold 2856 Apr 23 06:57 PlexusIoZipFileResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 534 Apr 23 06:57 package.html -drwxr-xr-x 2 krosenvold krosenvold 5 Apr 23 06:57 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -total 20 -drwxr-xr-x 2 krosenvold krosenvold 5 Apr 23 06:57 . -drwxr-xr-x 3 krosenvold krosenvold 18 Apr 23 06:57 .. --rw-r--r-- 1 krosenvold krosenvold 1753 Apr 23 06:57 PlexusIoProxyResource.java --rw-r--r-- 1 krosenvold krosenvold 6701 Apr 23 06:57 PlexusIoProxyResourceCollection.java --rw-r--r-- 1 krosenvold krosenvold 1897 Apr 23 06:57 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/Linux-p1.txt b/src/test/resources/Linux-p1.txt deleted file mode 100644 index bde274ed..00000000 --- a/src/test/resources/Linux-p1.txt +++ /dev/null @@ -1,77 +0,0 @@ -src/main/java/org/codehaus/plexus/components: -totalt 12 -drwxrwxr-x 3 1000 1002 4096 2010-04-21 08:58 . -drwxrwxr-x 3 1000 1002 4096 2010-04-21 08:58 .. -drwxrwxr-x 6 1000 1002 4096 2010-04-21 08:58 io - -src/main/java/org/codehaus/plexus/components/io: -totalt 24 -drwxrwxr-x 6 1000 1002 4096 2010-04-21 08:58 . -drwxrwxr-x 3 1000 1002 4096 2010-04-21 08:58 .. -drwxrwxr-x 2 1000 1002 4096 2010-04-22 21:19 attributes -drwxrwxr-x 2 1000 1002 4096 2010-04-21 20:06 filemappers -drwxrwxr-x 2 1000 1002 4096 2010-04-21 20:06 fileselectors -drwxrwxr-x 3 1000 1002 4096 2010-04-21 20:06 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -totalt 56 -drwxrwxr-x 2 1000 1002 4096 2010-04-22 21:19 . -drwxrwxr-x 6 1000 1002 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 1020 1030 1242 2010-04-21 20:06 AttributeConstants.java --rw-rw-r-- 1 1000 1000 9565 2010-04-21 20:06 FileAttributes.java --rw-rw-r-- 1 1000 1000 2179 2010-04-21 20:06 PlexusIoResourceAttributes.java --rw-rw-r-- 1 1000 1000 17872 2010-04-22 23:30 PlexusIoResourceAttributeUtils.java --rw-rw-r-- 1 1000 1000 5266 2010-04-21 20:06 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -totalt 44 -drwxrwxr-x 2 1000 1002 4096 2010-04-21 20:06 . -drwxrwxr-x 6 1000 1002 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 1000 1000 1293 2010-04-21 20:06 AbstractFileMapper.java --rw-rw-r-- 1 1000 1000 2516 2010-04-21 20:06 FileExtensionMapper.java --rw-rw-r-- 1 1000 1000 1358 2010-04-21 20:06 FileMapper.java --rw-rw-r-- 1 1000 1000 1384 2010-04-21 20:06 FlattenFileMapper.java --rw-rw-r-- 1 1000 1000 1216 2010-04-21 20:06 IdentityMapper.java --rw-rw-r-- 1 1000 1000 2013 2010-04-21 20:06 MergeFileMapper.java --rw-rw-r-- 1 1000 1000 877 2010-04-21 20:06 package.html --rw-rw-r-- 1 1000 1000 1665 2010-04-21 20:06 PrefixFileMapper.java --rw-rw-r-- 1 1000 1000 2497 2010-04-21 20:06 RegExpFileMapper.java - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -totalt 32 -drwxrwxr-x 2 1000 1002 4096 2010-04-21 20:06 . -drwxrwxr-x 6 1000 1002 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 1000 1000 1035 2010-04-21 20:06 AllFilesFileSelector.java --rw-rw-r-- 1 1000 1000 1761 2010-04-21 20:06 FileInfo.java --rw-rw-r-- 1 1000 1000 1377 2010-04-21 20:06 FileSelector.java --rw-rw-r-- 1 1000 1000 8145 2010-04-21 20:06 IncludeExcludeFileSelector.java --rw-rw-r-- 1 1000 1000 616 2010-04-21 20:06 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -totalt 80 -drwxrwxr-x 3 1000 1002 4096 2010-04-21 20:06 . -drwxrwxr-x 6 1000 1002 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 1000 1000 2277 2010-04-21 20:06 AbstractPlexusIoArchiveResourceCollection.java --rw-rw-r-- 1 1000 1000 6776 2010-04-21 20:06 AbstractPlexusIoResourceCollection.java --rw-rw-r-- 1 1000 1000 2884 2010-04-21 20:06 AbstractPlexusIoResource.java --rw-rw-r-- 1 1000 1000 1243 2010-04-21 20:06 AbstractPlexusIoResourceWithAttributes.java --rw-rw-r-- 1 1000 1000 534 2010-04-21 20:06 package.html --rw-rw-r-- 1 1000 1000 1042 2010-04-21 20:06 PlexusIoArchivedResourceCollection.java --rw-rw-r-- 1 1000 1000 2980 2010-04-21 20:06 PlexusIoCompressedFileResourceCollection.java --rw-rw-r-- 1 1000 1000 6054 2010-04-21 20:06 PlexusIoFileResourceCollection.java --rw-rw-r-- 1 1000 1000 3355 2010-04-21 20:06 PlexusIoFileResource.java --rw-rw-r-- 1 1000 1000 2127 2010-04-21 20:06 PlexusIoResourceCollection.java --rw-rw-r-- 1 1000 1000 1542 2010-04-21 20:06 PlexusIOResourceCollectionWithAttributes.java --rw-rw-r-- 1 1000 1000 1911 2010-04-21 20:06 PlexusIoResource.java --rw-rw-r-- 1 1000 1000 949 2010-04-21 20:06 PlexusIoResourceWithAttributes.java --rw-rw-r-- 1 1000 1000 1089 2010-04-21 20:06 PlexusIoURLResource.java --rw-rw-r-- 1 1000 1000 2856 2010-04-21 20:06 PlexusIoZipFileResourceCollection.java -drwxrwxr-x 2 1000 1002 4096 2010-04-21 20:06 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -totalt 24 -drwxrwxr-x 2 1000 1002 4096 2010-04-21 20:06 . -drwxrwxr-x 3 1000 1002 4096 2010-04-21 20:06 .. --rw-rw-r-- 1 1000 1000 6701 2010-04-21 20:06 PlexusIoProxyResourceCollection.java --rw-rw-r-- 1 1000 1000 1753 2010-04-21 20:06 PlexusIoProxyResource.java --rw-rw-r-- 1 1000 1000 1897 2010-04-21 20:06 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/Linux-p2.txt b/src/test/resources/Linux-p2.txt deleted file mode 100644 index b25dfdc1..00000000 --- a/src/test/resources/Linux-p2.txt +++ /dev/null @@ -1,77 +0,0 @@ -src/main/java/org/codehaus/plexus/components: -totalt 12 -drwxrwxr-x 3 kristian sveis 4096 2010-04-21 08:58 . -drwxrwxr-x 3 kristian sveis 4096 2010-04-21 08:58 .. -drwxrwxr-x 6 kristian sveis 4096 2010-04-21 08:58 io - -src/main/java/org/codehaus/plexus/components/io: -totalt 24 -drwxrwxr-x 6 kristian sveis 4096 2010-04-21 08:58 . -drwxrwxr-x 3 kristian sveis 4096 2010-04-21 08:58 .. -drwxrwxr-x 2 kristian sveis 4096 2010-04-22 21:19 attributes -drwxrwxr-x 2 kristian sveis 4096 2010-04-21 20:06 filemappers -drwxrwxr-x 2 kristian sveis 4096 2010-04-21 20:06 fileselectors -drwxrwxr-x 3 kristian sveis 4096 2010-04-21 20:06 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -totalt 56 -drwxrwxr-x 2 kristian sveis 4096 2010-04-22 21:19 . -drwxrwxr-x 6 kristian sveis 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 kristian kristian 1242 2010-04-21 20:06 AttributeConstants.java --rw-rw-r-- 1 kristian kristian 9565 2010-04-21 20:06 FileAttributes.java --rw-rw-r-- 1 kristian kristian 2179 2010-04-21 20:06 PlexusIoResourceAttributes.java --rw-rw-r-- 1 kristian kristian 17872 2010-04-22 23:30 PlexusIoResourceAttributeUtils.java --rw-rw-r-- 1 kristian kristian 5266 2010-04-21 20:06 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -totalt 44 -drwxrwxr-x 2 kristian sveis 4096 2010-04-21 20:06 . -drwxrwxr-x 6 kristian sveis 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 kristian kristian 1293 2010-04-21 20:06 AbstractFileMapper.java --rw-rw-r-- 1 kristian kristian 2516 2010-04-21 20:06 FileExtensionMapper.java --rw-rw-r-- 1 kristian kristian 1358 2010-04-21 20:06 FileMapper.java --rw-rw-r-- 1 kristian kristian 1384 2010-04-21 20:06 FlattenFileMapper.java --rw-rw-r-- 1 kristian kristian 1216 2010-04-21 20:06 IdentityMapper.java --rw-rw-r-- 1 kristian kristian 2013 2010-04-21 20:06 MergeFileMapper.java --rw-rw-r-- 1 kristian kristian 877 2010-04-21 20:06 package.html --rw-rw-r-- 1 kristian kristian 1665 2010-04-21 20:06 PrefixFileMapper.java --rw-rw-r-- 1 kristian kristian 2497 2010-04-21 20:06 RegExpFileMapper.java - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -totalt 32 -drwxrwxr-x 2 kristian sveis 4096 2010-04-21 20:06 . -drwxrwxr-x 6 kristian sveis 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 kristian kristian 1035 2010-04-21 20:06 AllFilesFileSelector.java --rw-rw-r-- 1 kristian kristian 1761 2010-04-21 20:06 FileInfo.java --rw-rw-r-- 1 kristian kristian 1377 2010-04-21 20:06 FileSelector.java --rw-rw-r-- 1 kristian kristian 8145 2010-04-21 20:06 IncludeExcludeFileSelector.java --rw-rw-r-- 1 kristian kristian 616 2010-04-21 20:06 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -totalt 80 -drwxrwxr-x 3 kristian sveis 4096 2010-04-21 20:06 . -drwxrwxr-x 6 kristian sveis 4096 2010-04-21 08:58 .. --rw-rw-r-- 1 kristian kristian 2277 2010-04-21 20:06 AbstractPlexusIoArchiveResourceCollection.java --rw-rw-r-- 1 kristian kristian 6776 2010-04-21 20:06 AbstractPlexusIoResourceCollection.java --rw-rw-r-- 1 kristian kristian 2884 2010-04-21 20:06 AbstractPlexusIoResource.java --rw-rw-r-- 1 kristian kristian 1243 2010-04-21 20:06 AbstractPlexusIoResourceWithAttributes.java --rw-rw-r-- 1 kristian kristian 534 2010-04-21 20:06 package.html --rw-rw-r-- 1 kristian kristian 1042 2010-04-21 20:06 PlexusIoArchivedResourceCollection.java --rw-rw-r-- 1 kristian kristian 2980 2010-04-21 20:06 PlexusIoCompressedFileResourceCollection.java --rw-rw-r-- 1 kristian kristian 6054 2010-04-21 20:06 PlexusIoFileResourceCollection.java --rw-rw-r-- 1 kristian kristian 3355 2010-04-21 20:06 PlexusIoFileResource.java --rw-rw-r-- 1 kristian kristian 2127 2010-04-21 20:06 PlexusIoResourceCollection.java --rw-rw-r-- 1 kristian kristian 1542 2010-04-21 20:06 PlexusIOResourceCollectionWithAttributes.java --rw-rw-r-- 1 kristian kristian 1911 2010-04-21 20:06 PlexusIoResource.java --rw-rw-r-- 1 kristian kristian 949 2010-04-21 20:06 PlexusIoResourceWithAttributes.java --rw-rw-r-- 1 kristian kristian 1089 2010-04-21 20:06 PlexusIoURLResource.java --rw-rw-r-- 1 kristian kristian 2856 2010-04-21 20:06 PlexusIoZipFileResourceCollection.java -drwxrwxr-x 2 kristian sveis 4096 2010-04-21 20:06 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -totalt 24 -drwxrwxr-x 2 kristian sveis 4096 2010-04-21 20:06 . -drwxrwxr-x 3 kristian sveis 4096 2010-04-21 20:06 .. --rw-rw-r-- 1 kristian kristian 6701 2010-04-21 20:06 PlexusIoProxyResourceCollection.java --rw-rw-r-- 1 kristian kristian 1753 2010-04-21 20:06 PlexusIoProxyResource.java --rw-rw-r-- 1 kristian kristian 1897 2010-04-21 20:06 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/SunOS-p1.txt b/src/test/resources/SunOS-p1.txt deleted file mode 100644 index cef7a7d4..00000000 --- a/src/test/resources/SunOS-p1.txt +++ /dev/null @@ -1,77 +0,0 @@ -src/main/java/org/codehaus/plexus/components: -total 6 -drwxrwxr-x 3 10105 10076 512 Apr 23 08:50 . -drwxrwxr-x 3 10105 10076 512 Apr 23 08:50 .. -drwxrwxr-x 6 10105 10076 512 Apr 23 08:50 io - -src/main/java/org/codehaus/plexus/components/io: -total 12 -drwxrwxr-x 6 10105 10076 512 Apr 23 08:50 . -drwxrwxr-x 3 10105 10076 512 Apr 23 08:50 .. -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 attributes -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 filemappers -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 fileselectors -drwxrwxr-x 3 10105 10076 1024 Apr 23 08:50 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -total 82 -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 . -drwxrwxr-x 6 10105 10076 512 Apr 23 08:50 .. --rw-rw-r-- 1 10105 10076 1242 Apr 23 08:50 AttributeConstants.java --rw-rw-r-- 1 10105 10076 9565 Apr 23 08:50 FileAttributes.java --rw-rw-r-- 1 10105 10076 2179 Apr 23 08:50 PlexusIoResourceAttributes.java --rw-rw-r-- 1 10105 10076 17872 Apr 23 08:50 PlexusIoResourceAttributeUtils.java --rw-rw-r-- 1 10105 10076 5266 Apr 23 08:50 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -total 42 -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 . -drwxrwxr-x 6 10105 10076 512 Apr 23 08:50 .. --rw-rw-r-- 1 10105 10076 1293 Apr 23 08:50 AbstractFileMapper.java --rw-rw-r-- 1 10105 10076 2516 Apr 23 08:50 FileExtensionMapper.java --rw-rw-r-- 1 10105 10076 1358 Apr 23 08:50 FileMapper.java --rw-rw-r-- 1 10105 10076 1384 Apr 23 08:50 FlattenFileMapper.java --rw-rw-r-- 1 10105 10076 1216 Apr 23 08:50 IdentityMapper.java --rw-rw-r-- 1 10105 10076 2013 Apr 23 08:50 MergeFileMapper.java --rw-rw-r-- 1 10105 10076 877 Apr 23 08:50 package.html --rw-rw-r-- 1 10105 10076 1665 Apr 23 08:50 PrefixFileMapper.java --rw-rw-r-- 1 10105 10076 2497 Apr 23 08:50 RegExpFileMapper.java - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -total 34 -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 . -drwxrwxr-x 6 10105 10076 512 Apr 23 08:50 .. --rw-rw-r-- 1 10105 10076 1035 Apr 23 08:50 AllFilesFileSelector.java --rw-rw-r-- 1 10105 10076 1761 Apr 23 08:50 FileInfo.java --rw-rw-r-- 1 10105 10076 1377 Apr 23 08:50 FileSelector.java --rw-rw-r-- 1 10105 10076 8145 Apr 23 08:50 IncludeExcludeFileSelector.java --rw-rw-r-- 1 10105 10076 616 Apr 23 08:50 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -total 94 -drwxrwxr-x 3 10105 10076 1024 Apr 23 08:50 . -drwxrwxr-x 6 10105 10076 512 Apr 23 08:50 .. --rw-rw-r-- 1 10105 10076 2277 Apr 23 08:50 AbstractPlexusIoArchiveResourceCollection.java --rw-rw-r-- 1 10105 10076 2884 Apr 23 08:50 AbstractPlexusIoResource.java --rw-rw-r-- 1 10105 10076 6776 Apr 23 08:50 AbstractPlexusIoResourceCollection.java --rw-rw-r-- 1 10105 10076 1243 Apr 23 08:50 AbstractPlexusIoResourceWithAttributes.java --rw-rw-r-- 1 10105 10076 534 Apr 23 08:50 package.html --rw-rw-r-- 1 10105 10076 1042 Apr 23 08:50 PlexusIoArchivedResourceCollection.java --rw-rw-r-- 1 10105 10076 2980 Apr 23 08:50 PlexusIoCompressedFileResourceCollection.java --rw-rw-r-- 1 10105 10076 3355 Apr 23 08:50 PlexusIoFileResource.java --rw-rw-r-- 1 10105 10076 6054 Apr 23 08:50 PlexusIoFileResourceCollection.java --rw-rw-r-- 1 10105 10076 1911 Apr 23 08:50 PlexusIoResource.java --rw-rw-r-- 1 10105 10076 2127 Apr 23 08:50 PlexusIoResourceCollection.java --rw-rw-r-- 1 10105 10076 1542 Apr 23 08:50 PlexusIOResourceCollectionWithAttributes.java --rw-rw-r-- 1 10105 10076 949 Apr 23 08:50 PlexusIoResourceWithAttributes.java --rw-rw-r-- 1 10105 10076 1089 Apr 23 08:50 PlexusIoURLResource.java --rw-rw-r-- 1 10105 10076 2856 Apr 23 08:50 PlexusIoZipFileResourceCollection.java -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -total 26 -drwxrwxr-x 2 10105 10076 512 Apr 23 08:50 . -drwxrwxr-x 3 10105 10076 1024 Apr 23 08:50 .. --rw-rw-r-- 1 10105 10076 1753 Apr 23 08:50 PlexusIoProxyResource.java --rw-rw-r-- 1 10105 10076 6701 Apr 23 08:50 PlexusIoProxyResourceCollection.java --rw-rw-r-- 1 10105 10076 1897 Apr 23 08:50 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/SunOS-p2.txt b/src/test/resources/SunOS-p2.txt deleted file mode 100644 index c88874e1..00000000 --- a/src/test/resources/SunOS-p2.txt +++ /dev/null @@ -1,77 +0,0 @@ -src/main/java/org/codehaus/plexus/components: -total 6 -drwxrwxr-x 3 a232322 git 512 Apr 23 08:50 . -drwxrwxr-x 3 a232322 git 512 Apr 23 08:50 .. -drwxrwxr-x 6 a232322 git 512 Apr 23 08:50 io - -src/main/java/org/codehaus/plexus/components/io: -total 12 -drwxrwxr-x 6 a232322 git 512 Apr 23 08:50 . -drwxrwxr-x 3 a232322 git 512 Apr 23 08:50 .. -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 attributes -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 filemappers -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 fileselectors -drwxrwxr-x 3 a232322 git 1024 Apr 23 08:50 resources - -src/main/java/org/codehaus/plexus/components/io/attributes: -total 82 -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 . -drwxrwxr-x 6 a232322 git 512 Apr 23 08:50 .. --rw-rw-r-- 1 a232322 git 1242 Apr 23 08:50 AttributeConstants.java --rw-rw-r-- 1 a232322 git 9565 Apr 23 08:50 FileAttributes.java --rw-rw-r-- 1 a232322 git 2179 Apr 23 08:50 PlexusIoResourceAttributes.java --rw-rw-r-- 1 a232322 git 17872 Apr 23 08:50 PlexusIoResourceAttributeUtils.java --rw-rw-r-- 1 a232322 git 5266 Apr 23 08:50 SimpleResourceAttributes.java - -src/main/java/org/codehaus/plexus/components/io/filemappers: -total 42 -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 . -drwxrwxr-x 6 a232322 git 512 Apr 23 08:50 .. --rw-rw-r-- 1 a232322 git 1293 Apr 23 08:50 AbstractFileMapper.java --rw-rw-r-- 1 a232322 git 2516 Apr 23 08:50 FileExtensionMapper.java --rw-rw-r-- 1 a232322 git 1358 Apr 23 08:50 FileMapper.java --rw-rw-r-- 1 a232322 git 1384 Apr 23 08:50 FlattenFileMapper.java --rw-rw-r-- 1 a232322 git 1216 Apr 23 08:50 IdentityMapper.java --rw-rw-r-- 1 a232322 git 2013 Apr 23 08:50 MergeFileMapper.java --rw-rw-r-- 1 a232322 git 877 Apr 23 08:50 package.html --rw-rw-r-- 1 a232322 git 1665 Apr 23 08:50 PrefixFileMapper.java --rw-rw-r-- 1 a232322 git 2497 Apr 23 08:50 RegExpFileMapper.java - -src/main/java/org/codehaus/plexus/components/io/fileselectors: -total 34 -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 . -drwxrwxr-x 6 a232322 git 512 Apr 23 08:50 .. --rw-rw-r-- 1 a232322 git 1035 Apr 23 08:50 AllFilesFileSelector.java --rw-rw-r-- 1 a232322 git 1761 Apr 23 08:50 FileInfo.java --rw-rw-r-- 1 a232322 git 1377 Apr 23 08:50 FileSelector.java --rw-rw-r-- 1 a232322 git 8145 Apr 23 08:50 IncludeExcludeFileSelector.java --rw-rw-r-- 1 a232322 git 616 Apr 23 08:50 package.html - -src/main/java/org/codehaus/plexus/components/io/resources: -total 94 -drwxrwxr-x 3 a232322 git 1024 Apr 23 08:50 . -drwxrwxr-x 6 a232322 git 512 Apr 23 08:50 .. --rw-rw-r-- 1 a232322 git 2277 Apr 23 08:50 AbstractPlexusIoArchiveResourceCollection.java --rw-rw-r-- 1 a232322 git 2884 Apr 23 08:50 AbstractPlexusIoResource.java --rw-rw-r-- 1 a232322 git 6776 Apr 23 08:50 AbstractPlexusIoResourceCollection.java --rw-rw-r-- 1 a232322 git 1243 Apr 23 08:50 AbstractPlexusIoResourceWithAttributes.java --rw-rw-r-- 1 a232322 git 534 Apr 23 08:50 package.html --rw-rw-r-- 1 a232322 git 1042 Apr 23 08:50 PlexusIoArchivedResourceCollection.java --rw-rw-r-- 1 a232322 git 2980 Apr 23 08:50 PlexusIoCompressedFileResourceCollection.java --rw-rw-r-- 1 a232322 git 3355 Apr 23 08:50 PlexusIoFileResource.java --rw-rw-r-- 1 a232322 git 6054 Apr 23 08:50 PlexusIoFileResourceCollection.java --rw-rw-r-- 1 a232322 git 1911 Apr 23 08:50 PlexusIoResource.java --rw-rw-r-- 1 a232322 git 2127 Apr 23 08:50 PlexusIoResourceCollection.java --rw-rw-r-- 1 a232322 git 1542 Apr 23 08:50 PlexusIOResourceCollectionWithAttributes.java --rw-rw-r-- 1 a232322 git 949 Apr 23 08:50 PlexusIoResourceWithAttributes.java --rw-rw-r-- 1 a232322 git 1089 Apr 23 08:50 PlexusIoURLResource.java --rw-rw-r-- 1 a232322 git 2856 Apr 23 08:50 PlexusIoZipFileResourceCollection.java -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 proxy - -src/main/java/org/codehaus/plexus/components/io/resources/proxy: -total 26 -drwxrwxr-x 2 a232322 git 512 Apr 23 08:50 . -drwxrwxr-x 3 a232322 git 1024 Apr 23 08:50 .. --rw-rw-r-- 1 a232322 git 1753 Apr 23 08:50 PlexusIoProxyResource.java --rw-rw-r-- 1 a232322 git 6701 Apr 23 08:50 PlexusIoProxyResourceCollection.java --rw-rw-r-- 1 a232322 git 1897 Apr 23 08:50 PlexusIoProxyResourceWithAttributes.java diff --git a/src/test/resources/Test-p1.txt b/src/test/resources/Test-p1.txt deleted file mode 100644 index 6430814e..00000000 --- a/src/test/resources/Test-p1.txt +++ /dev/null @@ -1,38 +0,0 @@ -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes: -totalt 0 -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 . -drwxr-xr-x 4 1003 1002 80 2010-04-23 11:24 .. -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 org - -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org: -totalt 0 -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 . -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 .. -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 chromattic - -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic: -totalt 0 -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 . -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 .. -drwxr-xr-x 4 1003 1002 80 2010-04-23 11:24 spi -build 23-Apr-2010 11:24:41 -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic/spi: -totalt 0 -drwxr-xr-x 4 1003 1002 80 2010-04-23 11:24 . -drwxr-xr-x 3 1003 1002 60 2010-04-23 11:24 .. -drwxr-xr-x 2 1003 1002 100 2010-04-23 11:24 instrument -drwxr-xr-x 2 1003 1002 60 2010-04-23 11:24 jcr -build 23-Apr-2010 11:24:41 -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic/spi/instrument: -totalt 12 -drwxr-xr-x 2 1003 1002 100 2010-04-23 11:24 . -drwxr-xr-x 4 1003 1002 80 2010-04-23 11:24 .. --rw-r--r-- 1 1003 1002 432 2010-04-23 11:24 Instrumentor.class --rw-r--r-- 1 1003 1002 288 2010-04-23 11:24 MethodHandler.class --rw-r--r-- 1 1003 1002 349 2010-04-23 11:24 ProxyFactory.class -build 23-Apr-2010 11:24:41 -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic/spi/jcr: -totalt 4 -drwxr-xr-x 2 1003 1002 60 2010-04-23 11:24 . -drwxr-xr-x 4 1003 1002 80 2010-04-23 11:24 .. --rw-r--r-- 1 1003 1002 508 2010-04-23 11:24 SessionLifeCycle.class diff --git a/src/test/resources/Test-p2.txt b/src/test/resources/Test-p2.txt deleted file mode 100644 index 04ce127a..00000000 --- a/src/test/resources/Test-p2.txt +++ /dev/null @@ -1,38 +0,0 @@ -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes: -totalt 0 -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 . -drwxr-xr-x 4 bamboo sveis 80 2010-04-23 11:24 .. -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 org - -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org: -totalt 0 -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 . -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 .. -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 chromattic - -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic: -totalt 0 -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 . -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 .. -drwxr-xr-x 4 bamboo sveis 80 2010-04-23 11:24 spi - -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic/spi: -totalt 0 -drwxr-xr-x 4 bamboo sveis 80 2010-04-23 11:24 . -drwxr-xr-x 3 bamboo sveis 60 2010-04-23 11:24 .. -drwxr-xr-x 2 bamboo sveis 100 2010-04-23 11:24 instrument -drwxr-xr-x 2 bamboo sveis 60 2010-04-23 11:24 jcr - -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic/spi/instrument: -totalt 12 -drwxr-xr-x 2 bamboo sveis 100 2010-04-23 11:24 . -drwxr-xr-x 4 bamboo sveis 80 2010-04-23 11:24 .. --rw-r--r-- 1 bamboo sveis 432 2010-04-23 11:24 Instrumentor.class --rw-r--r-- 1 bamboo sveis 288 2010-04-23 11:24 MethodHandler.class --rw-r--r-- 1 bamboo sveis 349 2010-04-23 11:24 ProxyFactory.class - -/home/bamboo/agent1/xml-data/build-dir/PARALLEL-CH1/checkout/spi/target/classes/org/chromattic/spi/jcr: -totalt 4 -drwxr-xr-x 2 bamboo sveis 60 2010-04-23 11:24 . -drwxr-xr-x 4 bamboo sveis 80 2010-04-23 11:24 .. --rw-r--r-- 1 bamboo sveis 508 2010-04-23 11:24 SessionLifeCycle.class diff --git a/src/test/resources/b26-linux-1laR.txt b/src/test/resources/b26-linux-1laR.txt deleted file mode 100644 index f66525b3..00000000 --- a/src/test/resources/b26-linux-1laR.txt +++ /dev/null @@ -1,139 +0,0 @@ -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule: -total 140 -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:17 . -drwxrwxr-x 14 release15 release15 4096 Oct 22 19:14 .. --rw-rw-r-- 1 release15 release15 111326 Oct 22 19:17 build.log -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:17 child --rw-rw-r-- 1 release15 release15 814 Oct 22 19:14 invoker.properties --rw-rw-r-- 1 release15 release15 1356 Oct 22 19:14 pom.xml -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 src --rw-rw-r-- 1 release15 release15 1289 Oct 22 19:14 verify.bsh - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child: -total 20 -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:17 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:17 .. --rw-rw-r-- 1 release15 release15 1811 Oct 22 19:14 pom.xml -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 src -drwxrwxr-x 6 release15 release15 4096 Oct 22 19:17 target - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:17 .. -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 main - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src/main: -total 16 -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 assembly -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 assembly-resources - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src/main/assembly: -total 12 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 .. --rw-rw-r-- 1 release15 release15 1389 Oct 22 19:14 src.xml - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources: -total 12 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 .. --rw-rw-r-- 1 release15 release15 18 Oct 22 19:14 test.txt - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target: -total 28 -drwxrwxr-x 6 release15 release15 4096 Oct 22 19:17 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:17 .. -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 archive-tmp -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 child-1-src --rw-rw-r-- 1 release15 release15 2206 Oct 22 19:17 child-1.jar -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 maven-archiver -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 surefire - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/archive-tmp: -total 8 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 . -drwxrwxr-x 6 release15 release15 4096 Oct 22 19:17 .. - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/child-1-src: -total 12 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 . -drwxrwxr-x 6 release15 release15 4096 Oct 22 19:17 .. ----------- 1 release15 release15 1 Oct 22 19:14 test.txt - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/maven-archiver: -total 12 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 . -drwxrwxr-x 6 release15 release15 4096 Oct 22 19:17 .. --rw-rw-r-- 1 release15 release15 124 Oct 22 19:17 pom.properties - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/surefire: -total 20 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:17 . -drwxrwxr-x 6 release15 release15 4096 Oct 22 19:17 .. --rw-rw-r-- 1 release15 release15 1449 Oct 22 19:17 surefire6670933677475933695tmp --rw-rw-r-- 1 release15 release15 623 Oct 22 19:17 surefire8953811750968444590tmp --rw-rw-r-- 1 release15 release15 849 Oct 22 19:17 surefirebooter6288163577541824457.jar - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:17 .. -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 main - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main: -total 16 -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 assembly -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 java - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/assembly: -total 12 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 .. --rw-rw-r-- 1 release15 release15 1482 Oct 22 19:14 bin.xml - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 4 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 org - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 apache - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 maven - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 plugin - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 assembly - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly: -total 12 -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 test - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test: -total 12 -drwxrwxr-x 2 release15 release15 4096 Oct 22 19:14 . -drwxrwxr-x 3 release15 release15 4096 Oct 22 19:14 .. --rw-rw-r-- 1 release15 release15 1012 Oct 22 19:14 App.java diff --git a/src/test/resources/b26-linux-1nlaR.txt b/src/test/resources/b26-linux-1nlaR.txt deleted file mode 100644 index 0085b4a7..00000000 --- a/src/test/resources/b26-linux-1nlaR.txt +++ /dev/null @@ -1,139 +0,0 @@ -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule: -total 140 -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:17 . -drwxrwxr-x 14 1003 1003 4096 Oct 22 19:14 .. --rw-rw-r-- 1 1003 1003 111326 Oct 22 19:17 build.log -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:17 child --rw-rw-r-- 1 1003 1003 814 Oct 22 19:14 invoker.properties --rw-rw-r-- 1 1003 1003 1356 Oct 22 19:14 pom.xml -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 src --rw-rw-r-- 1 1003 1003 1289 Oct 22 19:14 verify.bsh - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child: -total 20 -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:17 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:17 .. --rw-rw-r-- 1 1003 1003 1811 Oct 22 19:14 pom.xml -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 src -drwxrwxr-x 6 1003 1003 4096 Oct 22 19:17 target - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:17 .. -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 main - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src/main: -total 16 -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 assembly -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 assembly-resources - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src/main/assembly: -total 12 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 .. --rw-rw-r-- 1 1003 1003 1389 Oct 22 19:14 src.xml - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/src/main/assembly-resources: -total 12 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 .. --rw-rw-r-- 1 1003 1003 18 Oct 22 19:14 test.txt - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target: -total 28 -drwxrwxr-x 6 1003 1003 4096 Oct 22 19:17 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:17 .. -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 archive-tmp -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 child-1-src --rw-rw-r-- 1 1003 1003 2206 Oct 22 19:17 child-1.jar -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 maven-archiver -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 surefire - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/archive-tmp: -total 8 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 . -drwxrwxr-x 6 1003 1003 4096 Oct 22 19:17 .. - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/child-1-src: -total 12 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 . -drwxrwxr-x 6 1003 1003 4096 Oct 22 19:17 .. ----------- 1 1003 1003 1 Oct 22 19:14 test.txt - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/maven-archiver: -total 12 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 . -drwxrwxr-x 6 1003 1003 4096 Oct 22 19:17 .. --rw-rw-r-- 1 1003 1003 124 Oct 22 19:17 pom.properties - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/child/target/surefire: -total 20 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:17 . -drwxrwxr-x 6 1003 1003 4096 Oct 22 19:17 .. --rw-rw-r-- 1 1003 1003 1449 Oct 22 19:17 surefire6670933677475933695tmp --rw-rw-r-- 1 1003 1003 623 Oct 22 19:17 surefire8953811750968444590tmp --rw-rw-r-- 1 1003 1003 849 Oct 22 19:17 surefirebooter6288163577541824457.jar - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:17 .. -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 main - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main: -total 16 -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 assembly -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 java - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/assembly: -total 12 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 .. --rw-rw-r-- 1 1003 1003 1482 Oct 22 19:14 bin.xml - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 4 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 org - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 apache - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 maven - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 plugin - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 assembly - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly: -total 12 -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 test - -/home/release15/maven-plugins/maven-assembly-plugin/target/it/projects/file-sets/filtered-multimodule/src/main/java/org/apache/maven/plugin/assembly/test: -total 12 -drwxrwxr-x 2 1003 1003 4096 Oct 22 19:14 . -drwxrwxr-x 3 1003 1003 4096 Oct 22 19:14 .. --rw-rw-r-- 1 1003 1003 1012 Oct 22 19:14 App.java From 3c7cc25f2d72f5386dc261ec8595c32b67cb45d8 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Sun, 16 Apr 2017 00:41:12 +0300 Subject: [PATCH 5/9] Refactor the code to use diamond operators (<>) and try with resources --- .../plexus/components/io/attributes/AttributeUtils.java | 2 +- .../io/attributes/PlexusIoResourceAttributeUtils.java | 7 +++---- .../io/resources/PlexusIoFileResourceCollection.java | 6 +++--- .../plexus/components/io/resources/proxy/ProxyFactory.java | 2 +- .../components/io/attributes/FileAttributesTest.java | 4 ++-- .../plexus/components/io/filemappers/ResourcesTest.java | 7 +------ 6 files changed, 11 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java index 2a11d11f..06bcae05 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java @@ -65,7 +65,7 @@ public static void chmod( @Nonnull File file, int mode ) @Nonnull public static Set getPermissions( int mode ) { - Set perms = new HashSet(); + Set perms = new HashSet<>(); //add owners permission if ( ( mode & 0400 ) > 0 ) { diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java index 58fb8798..8ddf7ad0 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java @@ -183,8 +183,8 @@ public static Map getFileAttributesByPath( F public static @Nonnull Map getFileAttributesByPath(@Nonnull File dir, boolean recursive ) throws IOException { - Map userCache = new HashMap(); - Map groupCache = new HashMap(); + Map userCache = new HashMap<>(); + Map groupCache = new HashMap<>(); final List fileAndDirectoryNames; if ( recursive && dir.isDirectory() ) { @@ -195,8 +195,7 @@ public static Map getFileAttributesByPath( F fileAndDirectoryNames = Collections.singletonList( dir.getAbsolutePath() ); } - final Map attributesByPath = - new LinkedHashMap(); + final Map attributesByPath = new LinkedHashMap<>(); for ( String fileAndDirectoryName : fileAndDirectoryNames ) { diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java index 333a2b26..91b0cef2 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java @@ -145,8 +145,8 @@ private void addResources( List result, String[] resources ) { final File dir = getBaseDir(); - final HashMap cache1 = new HashMap(); - final HashMap cache2 = new HashMap(); + final HashMap cache1 = new HashMap<>(); + final HashMap cache2 = new HashMap<>(); for ( String name : resources ) { String sourceDir = name.replace( '\\', '/' ); @@ -241,7 +241,7 @@ public Iterator getResources() ds.setFollowSymlinks( isFollowingSymLinks() ); ds.scan(); - final List result = new ArrayList(); + final List result = new ArrayList<>(); if ( isIncludingEmptyDirectories() ) { String[] dirs = ds.getIncludedDirectories(); diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java index 61bac229..5e06a9ea 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java @@ -30,7 +30,7 @@ public class ProxyFactory public static PlexusIoResource createProxy(@Nonnull PlexusIoResource target, Object alternateSupplier) { - List interfaces = new ArrayList( ); + List interfaces = new ArrayList<>( ); interfaces.add( PlexusIoResource.class); if (target instanceof SymlinkDestinationSupplier ) interfaces.add( SymlinkDestinationSupplier.class); if (target instanceof FileSupplier ) interfaces.add( FileSupplier.class); diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java index 51e337b7..fd292737 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java @@ -39,8 +39,8 @@ public void testGetPosixFileAttributes() } File file = new File( "." ); - Map userCache = new HashMap(); - Map groupCache = new HashMap(); + Map userCache = new HashMap<>(); + Map groupCache = new HashMap<>(); PlexusIoResourceAttributes fa = new FileAttributes( file, userCache, groupCache ); assertNotNull( fa ); diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java index c2f012f6..f9dcede5 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java @@ -114,8 +114,7 @@ private void createZipFile( File dest, File dir ) throws IOException private void compare( InputStream in, File file ) throws IOException { - InputStream fIn = new FileInputStream( file ); - try + try( InputStream fIn = new FileInputStream( file ) ) { for ( ;; ) { @@ -128,10 +127,6 @@ private void compare( InputStream in, File file ) } } } - finally - { - fIn.close(); - } } private void compare( PlexusIoResource res, File file ) From c5faa41ac2ed5fe80d63a6ef5f4f9af8691ff720 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Wed, 3 May 2017 20:47:24 +0300 Subject: [PATCH 6/9] Use the system line separator instead of `\n` --- .../components/io/attributes/FileAttributes.java | 16 ++++++++++++---- .../io/attributes/SimpleResourceAttributes.java | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java index cdf9858e..86e9a965 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java @@ -175,13 +175,21 @@ public boolean isWorldWritable() { public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("\nFile Attributes:\n------------------------------\nuser: "); + sb.append(System.lineSeparator()); + sb.append("File Attributes:"); + sb.append(System.lineSeparator()); + sb.append("------------------------------"); + sb.append(System.lineSeparator()); + sb.append("user: "); sb.append(userName == null ? "" : userName); - sb.append("\ngroup: "); + sb.append(System.lineSeparator()); + sb.append("group: "); sb.append(groupName == null ? "" : groupName); - sb.append("\nuid: "); + sb.append(System.lineSeparator()); + sb.append("uid: "); sb.append(hasUserId() ? Integer.toString(userId) : ""); - sb.append("\ngid: "); + sb.append(System.lineSeparator()); + sb.append("gid: "); sb.append(hasGroupId() ? Integer.toString(groupId) : ""); return sb.toString(); diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java index e4c870e4..4daffe1e 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java @@ -170,7 +170,7 @@ public PlexusIoResourceAttributes setOctalModeString( String mode ) public String toString() { return String.format( - "\nResource Attributes:\n------------------------------\nuser: %s\ngroup: %s\nuid: %d\ngid: %d\nmode: %06o", + "%nResource Attributes:%n------------------------------%nuser: %s%ngroup: %s%nuid: %d%ngid: %d%nmode: %06o", userName == null ? "" : userName, groupName == null ? "" : groupName, uid != null ? uid : 0, From aed65dfe1787e0c95dcb617a57ae77e66c25e2ec Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Wed, 3 May 2017 20:54:29 +0300 Subject: [PATCH 7/9] Drop the check for Windows 9x We could quite safely assume that the tests are not going to be executed on Windows 9x. --- .../plexus/components/io/attributes/FileAttributesTest.java | 2 +- .../io/attributes/PlexusIoResourceAttributeUtilsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java index fd292737..8e5073c8 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java @@ -33,7 +33,7 @@ public void testGetPosixFileAttributes() throws Exception { - if ( Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_WIN9X ) ) + if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) { return; } diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java index 43c17631..4db60168 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java @@ -70,7 +70,7 @@ public void testGetAttributesForThisTestClass() public void testFolder() throws IOException, CommandLineException { - if (Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_WIN9X )){ + if (Os.isFamily( Os.FAMILY_WINDOWS )){ return; // Nothing to do here. } @@ -113,7 +113,7 @@ public void testFolder() public void testSrcResource() throws IOException { - if (Os.isFamily( Os.FAMILY_WINDOWS ) || Os.isFamily( Os.FAMILY_WIN9X )){ + if (Os.isFamily( Os.FAMILY_WINDOWS )){ return; // Nothing to do here. } From 88cda2065e5aa190652787dd66579df7cfbea426 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Wed, 3 May 2017 21:06:49 +0300 Subject: [PATCH 8/9] Code cleanup - rename test from `testFolder` to `testDirectory` Unix uses the term 'Directory' and the test runs only on Unix-like OSes. Change the test name accordingly. --- .../io/attributes/PlexusIoResourceAttributeUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java index 4db60168..66e51ba2 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java @@ -67,7 +67,7 @@ public void testGetAttributesForThisTestClass() assertEquals( System.getProperty( "user.name" ), fileAttrs.getUserName() ); } - public void testFolder() + public void testDirectory() throws IOException, CommandLineException { if (Os.isFamily( Os.FAMILY_WINDOWS )){ From 55773f5bfeb48c53c7200c64da3a1c8032028f93 Mon Sep 17 00:00:00 2001 From: Plamen Totev Date: Thu, 4 May 2017 22:58:36 +0300 Subject: [PATCH 9/9] Reformat to a common code style --- .../io/attributes/AttributeUtils.java | 13 +- .../io/attributes/FileAttributes.java | 216 +++++++++++------- .../PlexusIoResourceAttributeUtils.java | 7 +- .../PlexusIoResourceAttributes.java | 12 +- .../attributes/SimpleResourceAttributes.java | 2 +- .../io/attributes/SymlinkUtils.java | 9 +- .../io/filemappers/AbstractFileMapper.java | 8 +- .../io/filemappers/PrefixFileMapper.java | 3 +- .../io/filemappers/RegExpFileMapper.java | 145 ++++++------ .../fileselectors/AllFilesFileSelector.java | 1 - .../io/fileselectors/FileSelector.java | 1 - .../IncludeExcludeFileSelector.java | 20 +- .../io/functions/InputStreamTransformer.java | 3 +- ...ractPlexusIoArchiveResourceCollection.java | 32 +-- .../resources/AbstractPlexusIoResource.java | 7 +- .../AbstractPlexusIoResourceCollection.java | 1 - ...xusIoResourceCollectionWithAttributes.java | 4 +- .../io/resources/ClosingInputStream.java | 32 ++- .../components/io/resources/Deferred.java | 6 +- .../io/resources/EncodingSupported.java | 2 +- .../PlexusIoArchivedResourceCollection.java | 1 - ...xusIoCompressedFileResourceCollection.java | 14 +- .../io/resources/PlexusIoFileResource.java | 65 +++--- .../PlexusIoFileResourceCollection.java | 21 +- .../resources/PlexusIoResourceCollection.java | 16 +- .../io/resources/PlexusIoSymlinkResource.java | 2 +- .../io/resources/PlexusIoURLResource.java | 4 +- .../io/resources/ResourceFactory.java | 8 +- .../components/io/resources/Stream.java | 2 +- .../PlexusIoProxyResourceCollection.java | 56 +++-- .../io/resources/proxy/ProxyFactory.java | 19 +- .../proxy/ResourceInvocationHandler.java | 32 ++- .../AbstractResourceAttributesTCK.java | 65 +++--- .../io/attributes/AttributeUtilsTest.java | 35 +-- .../PlexusIoResourceAttributeUtilsTest.java | 79 ++++--- .../SimpleResourceAttributesTest.java | 1 - .../io/attributes/SymlinkUtilsTest.java | 29 +-- .../io/filemappers/FileMapperTest.java | 12 +- .../io/filemappers/FileSelectorTest.java | 18 +- .../io/filemappers/ResourcesTest.java | 59 +++-- ...bstractPlexusIoResourceCollectionTest.java | 14 +- ...sIoFileSupplierResourceCollectionTest.java | 14 +- .../PlexusIoPlexusIoFileResourceTest.java | 11 +- .../PlexusIoProxyResourceCollectionTest.java | 9 +- .../io/resources/proxy/ProxyFactoryTest.java | 12 +- 45 files changed, 617 insertions(+), 505 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java index 06bcae05..d946b89f 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/AttributeUtils.java @@ -66,7 +66,7 @@ public static void chmod( @Nonnull File file, int mode ) public static Set getPermissions( int mode ) { Set perms = new HashSet<>(); - //add owners permission + // add owners permission if ( ( mode & 0400 ) > 0 ) { perms.add( PosixFilePermission.OWNER_READ ); @@ -79,7 +79,7 @@ public static Set getPermissions( int mode ) { perms.add( PosixFilePermission.OWNER_EXECUTE ); } - //add group permissions + // add group permissions if ( ( mode & 0040 ) > 0 ) { perms.add( PosixFilePermission.GROUP_READ ); @@ -92,7 +92,7 @@ public static Set getPermissions( int mode ) { perms.add( PosixFilePermission.GROUP_EXECUTE ); } - //add others permissions + // add others permissions if ( ( mode & 0004 ) > 0 ) { perms.add( PosixFilePermission.OTHERS_READ ); @@ -125,7 +125,7 @@ public static BasicFileAttributes getFileAttributes( @Nonnull File file ) public static BasicFileAttributes getFileAttributes( Path path ) throws IOException { - if (isUnix(path)) + if ( isUnix( path ) ) { try @@ -140,8 +140,9 @@ public static BasicFileAttributes getFileAttributes( Path path ) return Files.readAttributes( path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS ); } - public static boolean isUnix(Path path) { - return path.getFileSystem().supportedFileAttributeViews().contains("unix"); + public static boolean isUnix( Path path ) + { + return path.getFileSystem().supportedFileAttributeViews().contains( "unix" ); } @Nullable diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java index 86e9a965..8cf28f55 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/FileAttributes.java @@ -37,7 +37,8 @@ * Immutable */ public class FileAttributes - implements PlexusIoResourceAttributes { + implements PlexusIoResourceAttributes +{ @Nullable private final Integer groupId; @@ -55,197 +56,236 @@ public class FileAttributes private final Set permissions; - public FileAttributes(@Nonnull File file, @Nonnull Map userCache, - @Nonnull Map groupCache) - throws IOException { - + public FileAttributes( @Nonnull File file, @Nonnull Map userCache, + @Nonnull Map groupCache ) + throws IOException + { Path path = file.toPath(); - if (AttributeUtils.isUnix(path)) { - Map attrs = Files.readAttributes(path, "unix:*", LinkOption.NOFOLLOW_LINKS); - this.permissions = (Set) attrs.get("permissions"); + if ( AttributeUtils.isUnix( path ) ) + { + Map attrs = Files.readAttributes( path, "unix:*", LinkOption.NOFOLLOW_LINKS ); + this.permissions = (Set) attrs.get( "permissions" ); - groupId = (Integer) attrs.get("gid"); + groupId = (Integer) attrs.get( "gid" ); - String groupName = groupCache.get(groupId); - if (groupName != null) { + String groupName = groupCache.get( groupId ); + if ( groupName != null ) + { this.groupName = groupName; - } else { - this.groupName = ((Principal) attrs.get("group")).getName(); - groupCache.put(groupId, this.groupName); } - userId = (Integer) attrs.get("uid"); - String userName = userCache.get(userId); - if (userName != null) { + else + { + this.groupName = ( (Principal) attrs.get( "group" ) ).getName(); + groupCache.put( groupId, this.groupName ); + } + userId = (Integer) attrs.get( "uid" ); + String userName = userCache.get( userId ); + if ( userName != null ) + { this.userName = userName; - } else { - this.userName = ((Principal) attrs.get("owner")).getName(); - userCache.put(userId, this.userName); } - octalMode = (Integer) attrs.get("mode") & 0xfff; // Mask off top bits for compatibilty. Maybe check if we can skip this - symbolicLink = (Boolean) attrs.get("isSymbolicLink"); - } else { - FileOwnerAttributeView fa = AttributeUtils.getFileOwnershipInfo(file); + else + { + this.userName = ( (Principal) attrs.get( "owner" ) ).getName(); + userCache.put( userId, this.userName ); + } + octalMode = (Integer) attrs.get( "mode" ) & 0xfff; // Mask off top bits for compatibilty. Maybe check if we + // can skip this + symbolicLink = (Boolean) attrs.get( "isSymbolicLink" ); + } + else + { + FileOwnerAttributeView fa = AttributeUtils.getFileOwnershipInfo( file ); this.userName = fa.getOwner().getName(); userId = null; this.groupName = null; this.groupId = null; octalMode = PlexusIoResourceAttributes.UNKNOWN_OCTAL_MODE; permissions = Collections.emptySet(); - symbolicLink = Files.isSymbolicLink(path); + symbolicLink = Files.isSymbolicLink( path ); } } - public static - @Nonnull - PlexusIoResourceAttributes uncached(@Nonnull File file) - throws IOException { - return new FileAttributes(file, new HashMap(), new HashMap()); + public static @Nonnull + PlexusIoResourceAttributes uncached( @Nonnull File file ) + throws IOException + { + return new FileAttributes( file, new HashMap(), new HashMap() ); } - @Nullable - public Integer getGroupId() { + public Integer getGroupId() + { return groupId; } - public boolean hasGroupId() { + public boolean hasGroupId() + { return false; } - public boolean hasUserId() { + public boolean hasUserId() + { return false; } @Nullable - public String getGroupName() { + public String getGroupName() + { return groupName; } - public Integer getUserId() { + public Integer getUserId() + { return userId; } - public String getUserName() { + public String getUserName() + { return userName; } - public boolean isGroupExecutable() { - return containsPermission(PosixFilePermission.GROUP_EXECUTE); + public boolean isGroupExecutable() + { + return containsPermission( PosixFilePermission.GROUP_EXECUTE ); } - private boolean containsPermission(PosixFilePermission groupExecute) { - return permissions.contains(groupExecute); + private boolean containsPermission( PosixFilePermission groupExecute ) + { + return permissions.contains( groupExecute ); } - public boolean isGroupReadable() { - return containsPermission(PosixFilePermission.GROUP_READ); + public boolean isGroupReadable() + { + return containsPermission( PosixFilePermission.GROUP_READ ); } - public boolean isGroupWritable() { - return containsPermission(PosixFilePermission.GROUP_WRITE); + public boolean isGroupWritable() + { + return containsPermission( PosixFilePermission.GROUP_WRITE ); } - public boolean isOwnerExecutable() { - return containsPermission(PosixFilePermission.OWNER_EXECUTE); + public boolean isOwnerExecutable() + { + return containsPermission( PosixFilePermission.OWNER_EXECUTE ); } - public boolean isOwnerReadable() { - return containsPermission(PosixFilePermission.OWNER_READ); + public boolean isOwnerReadable() + { + return containsPermission( PosixFilePermission.OWNER_READ ); } - public boolean isOwnerWritable() { - return containsPermission(PosixFilePermission.OWNER_WRITE); + public boolean isOwnerWritable() + { + return containsPermission( PosixFilePermission.OWNER_WRITE ); } - public boolean isWorldExecutable() { - return containsPermission(PosixFilePermission.OTHERS_EXECUTE); + public boolean isWorldExecutable() + { + return containsPermission( PosixFilePermission.OTHERS_EXECUTE ); } - public boolean isWorldReadable() { - return containsPermission(PosixFilePermission.OTHERS_READ); + public boolean isWorldReadable() + { + return containsPermission( PosixFilePermission.OTHERS_READ ); } - public boolean isWorldWritable() { - return containsPermission(PosixFilePermission.OTHERS_WRITE); + public boolean isWorldWritable() + { + return containsPermission( PosixFilePermission.OTHERS_WRITE ); } - public String toString() { + public String toString() + { StringBuilder sb = new StringBuilder(); - sb.append(System.lineSeparator()); - sb.append("File Attributes:"); - sb.append(System.lineSeparator()); - sb.append("------------------------------"); - sb.append(System.lineSeparator()); - sb.append("user: "); - sb.append(userName == null ? "" : userName); - sb.append(System.lineSeparator()); - sb.append("group: "); - sb.append(groupName == null ? "" : groupName); - sb.append(System.lineSeparator()); - sb.append("uid: "); - sb.append(hasUserId() ? Integer.toString(userId) : ""); - sb.append(System.lineSeparator()); - sb.append("gid: "); - sb.append(hasGroupId() ? Integer.toString(groupId) : ""); + sb.append( System.lineSeparator() ); + sb.append( "File Attributes:" ); + sb.append( System.lineSeparator() ); + sb.append( "------------------------------" ); + sb.append( System.lineSeparator() ); + sb.append( "user: " ); + sb.append( userName == null ? "" : userName ); + sb.append( System.lineSeparator() ); + sb.append( "group: " ); + sb.append( groupName == null ? "" : groupName ); + sb.append( System.lineSeparator() ); + sb.append( "uid: " ); + sb.append( hasUserId() ? Integer.toString( userId ) : "" ); + sb.append( System.lineSeparator() ); + sb.append( "gid: " ); + sb.append( hasGroupId() ? Integer.toString( groupId ) : "" ); return sb.toString(); } - public int getOctalMode() { + public int getOctalMode() + { return octalMode; } - public int calculatePosixOctalMode() { + public int calculatePosixOctalMode() + { int result = 0; - if (isOwnerReadable()) { + if ( isOwnerReadable() ) + { result |= AttributeConstants.OCTAL_OWNER_READ; } - if (isOwnerWritable()) { + if ( isOwnerWritable() ) + { result |= AttributeConstants.OCTAL_OWNER_WRITE; } - if (isOwnerExecutable()) { + if ( isOwnerExecutable() ) + { result |= AttributeConstants.OCTAL_OWNER_EXECUTE; } - if (isGroupReadable()) { + if ( isGroupReadable() ) + { result |= AttributeConstants.OCTAL_GROUP_READ; } - if (isGroupWritable()) { + if ( isGroupWritable() ) + { result |= AttributeConstants.OCTAL_GROUP_WRITE; } - if (isGroupExecutable()) { + if ( isGroupExecutable() ) + { result |= AttributeConstants.OCTAL_GROUP_EXECUTE; } - if (isWorldReadable()) { + if ( isWorldReadable() ) + { result |= AttributeConstants.OCTAL_WORLD_READ; } - if (isWorldWritable()) { + if ( isWorldWritable() ) + { result |= AttributeConstants.OCTAL_WORLD_WRITE; } - if (isWorldExecutable()) { + if ( isWorldExecutable() ) + { result |= AttributeConstants.OCTAL_WORLD_EXECUTE; } return result; } - public String getOctalModeString() { - return Integer.toString(getOctalMode(), 8); + public String getOctalModeString() + { + return Integer.toString( getOctalMode(), 8 ); } - public boolean isSymbolicLink() { + public boolean isSymbolicLink() + { return symbolicLink; } } \ No newline at end of file diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java index 8ddf7ad0..526a7c2e 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtils.java @@ -35,7 +35,6 @@ private PlexusIoResourceAttributeUtils() { } - public static PlexusIoResourceAttributes mergeAttributes( PlexusIoResourceAttributes override, PlexusIoResourceAttributes base, PlexusIoResourceAttributes def ) @@ -53,7 +52,7 @@ public static PlexusIoResourceAttributes mergeAttributes( PlexusIoResourceAttrib { result = new SimpleResourceAttributes( base.getUserId(), base.getUserName(), base.getGroupId(), base.getGroupName(), base.getOctalMode() ); - result.setSymbolicLink( base.isSymbolicLink() ); + result.setSymbolicLink( base.isSymbolicLink() ); } if ( override.getGroupId() != null && override.getGroupId() != -1 ) @@ -180,7 +179,9 @@ public static Map getFileAttributesByPath( F return getFileAttributesByPath( dir, true ); } - public static @Nonnull Map getFileAttributesByPath(@Nonnull File dir, boolean recursive ) + public static @Nonnull + Map getFileAttributesByPath( @Nonnull File dir, + boolean recursive ) throws IOException { Map userCache = new HashMap<>(); diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java index 04a6f565..2b52699b 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributes.java @@ -24,21 +24,21 @@ public interface PlexusIoResourceAttributes int UNKNOWN_OCTAL_MODE = -1; boolean isOwnerReadable(); - + boolean isOwnerWritable(); - + boolean isOwnerExecutable(); - + boolean isGroupReadable(); boolean isGroupWritable(); - + boolean isGroupExecutable(); - + boolean isWorldReadable(); boolean isWorldWritable(); - + boolean isWorldExecutable(); /** diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java b/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java index 4daffe1e..301905e5 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributes.java @@ -48,7 +48,7 @@ public SimpleResourceAttributes( Integer uid, String userName, Integer gid, Stri public static PlexusIoResourceAttributes lastResortDummyAttributesForBrokenOS() { - return new SimpleResourceAttributes( ); + return new SimpleResourceAttributes(); } SimpleResourceAttributes() diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/SymlinkUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/SymlinkUtils.java index 30095704..beddad07 100644 --- a/src/main/java/org/codehaus/plexus/components/io/attributes/SymlinkUtils.java +++ b/src/main/java/org/codehaus/plexus/components/io/attributes/SymlinkUtils.java @@ -35,18 +35,21 @@ public class SymlinkUtils * @throws java.io.IOException */ - public static @Nonnull File readSymbolicLink( @Nonnull File symlink ) + public static @Nonnull + File readSymbolicLink( @Nonnull File symlink ) throws IOException { final java.nio.file.Path path = java.nio.file.Files.readSymbolicLink( symlink.toPath() ); return path.toFile(); } - public static @Nonnull File createSymbolicLink( @Nonnull File symlink, File target ) + public static @Nonnull + File createSymbolicLink( @Nonnull File symlink, File target ) throws IOException { Path link = symlink.toPath(); - if (!Files.exists(link, LinkOption.NOFOLLOW_LINKS)){ + if ( !Files.exists( link, LinkOption.NOFOLLOW_LINKS ) ) + { link = java.nio.file.Files.createSymbolicLink( link, target.toPath() ); } return link.toFile(); diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/AbstractFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/AbstractFileMapper.java index 92611952..565ae9ea 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/AbstractFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/AbstractFileMapper.java @@ -27,10 +27,10 @@ */ public abstract class AbstractFileMapper implements FileMapper { - /** - * Checks the input and returns it without modifications. - */ - public @Nonnull String getMappedFileName( @Nonnull String pName ) + /** + * Checks the input and returns it without modifications. + */ + public @Nonnull String getMappedFileName( @Nonnull String pName ) { if ( pName == null || pName.length() == 0 ) { diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java index 49e18486..389a39c7 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/PrefixFileMapper.java @@ -16,7 +16,6 @@ * limitations under the License. */ - import javax.annotation.Nonnull; /** @@ -58,7 +57,7 @@ public void setPrefix( String prefix ) */ public static String getMappedFileName( String prefix, String name ) { - if ( prefix == null || prefix.length() == 0 ) + if ( prefix == null || prefix.length() == 0 ) { return name; } diff --git a/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java b/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java index 9f26b991..2ec1ecb6 100644 --- a/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java +++ b/src/main/java/org/codehaus/plexus/components/io/filemappers/RegExpFileMapper.java @@ -20,91 +20,94 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; - - /** * Implementation of a file mapper, which uses regular expressions. */ -public class RegExpFileMapper extends AbstractFileMapper { +public class RegExpFileMapper + extends AbstractFileMapper +{ /** * The regexp mappers role-hint: "regexp". */ public static final String ROLE_HINT = "regexp"; private Pattern pattern; - private String replacement; - private boolean replaceAll; - /** - * Sets the regular expression pattern. - */ - public void setPattern(String pPattern) - { - pattern = Pattern.compile(pPattern); - } + private String replacement; + + private boolean replaceAll; + + /** + * Sets the regular expression pattern. + */ + public void setPattern( String pPattern ) + { + pattern = Pattern.compile( pPattern ); + } - /** - * Returns the regular expression pattern. - */ - public String getPattern() - { - return pattern == null ? null : pattern.pattern(); - } + /** + * Returns the regular expression pattern. + */ + public String getPattern() + { + return pattern == null ? null : pattern.pattern(); + } - /** - * Sets the replacement string. - */ - public void setReplacement(String pReplacement) - { - replacement = pReplacement; - } + /** + * Sets the replacement string. + */ + public void setReplacement( String pReplacement ) + { + replacement = pReplacement; + } - /** - * Returns the replacement string. - */ - public String getReplacement() - { - return replacement; - } + /** + * Returns the replacement string. + */ + public String getReplacement() + { + return replacement; + } - /** - * Returns, whether to replace the first occurrency of the pattern - * (default), or all. - */ - public boolean getReplaceAll() - { - return replaceAll; - } + /** + * Returns, whether to replace the first occurrency of the pattern + * (default), or all. + */ + public boolean getReplaceAll() + { + return replaceAll; + } - /** - * Sets, whether to replace the first occurrency of the pattern - * (default), or all. - */ - public void setReplaceAll(boolean pReplaceAll) - { - replaceAll = pReplaceAll; - } + /** + * Sets, whether to replace the first occurrency of the pattern + * (default), or all. + */ + public void setReplaceAll( boolean pReplaceAll ) + { + replaceAll = pReplaceAll; + } - @Nonnull public String getMappedFileName( @Nonnull String pName) - { - final String name = super.getMappedFileName(pName); - if (pattern == null) - { - throw new IllegalStateException("The regular expression pattern has not been set."); - } - if (replacement == null) - { - throw new IllegalStateException("The pattern replacement string has not been set."); - } - final Matcher matcher = pattern.matcher(name); - if (!matcher.find()) - { - return name; - } - if (!getReplaceAll()) - { - return matcher.replaceFirst(replacement); - } - return matcher.replaceAll(replacement); - } + @Nonnull + public String getMappedFileName( @Nonnull String pName) + { + final String name = super.getMappedFileName( pName ); + if ( pattern == null ) + { + throw new IllegalStateException( "The regular expression pattern has not been set." ); + } + if (replacement == null) + { + throw new IllegalStateException( "The pattern replacement string has not been set." ); + } + final Matcher matcher = pattern.matcher( name ); + if ( !matcher.find() ) + { + return name; + } + if ( !getReplaceAll() ) + { + return matcher.replaceFirst( replacement ); + } + return matcher.replaceAll( replacement ); + } } diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java index c2c94200..0bcfb5b6 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/AllFilesFileSelector.java @@ -18,7 +18,6 @@ import javax.annotation.Nonnull; - /** * The default file selector: Selects all files. */ diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java index 0daab78d..e5cf7cf0 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/FileSelector.java @@ -19,7 +19,6 @@ import javax.annotation.Nonnull; import java.io.IOException; - /** * Interface of a component, which selects/deselects files. */ diff --git a/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java b/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java index 5091fb67..309dba64 100644 --- a/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java +++ b/src/main/java/org/codehaus/plexus/components/io/fileselectors/IncludeExcludeFileSelector.java @@ -25,21 +25,21 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; - /** * This file selector uses a set of patterns for including/excluding * files. */ -public class - IncludeExcludeFileSelector implements FileSelector +public class IncludeExcludeFileSelector + implements FileSelector { /** * The include/exclude file selectors role-hint: "standard". */ public static final String ROLE_HINT = "standard"; - private static final MatchPatterns ALL_INCLUDES = MatchPatterns.from( getCanonicalName( "**/*" )); - private static final MatchPatterns ZERO_EXCLUDES = MatchPatterns.from( ); + private static final MatchPatterns ALL_INCLUDES = MatchPatterns.from( getCanonicalName( "**/*" ) ); + + private static final MatchPatterns ZERO_EXCLUDES = MatchPatterns.from(); private boolean isCaseSensitive = true; @@ -77,7 +77,7 @@ protected boolean isExcluded( @Nonnull String name ) * May be null, indicating that all files * should be included. If a non-null * list is given, all elements must be - * non-null. + * non-null. */ public void setIncludes( @Nullable String[] includes ) { @@ -88,7 +88,7 @@ public void setIncludes( @Nullable String[] includes ) } else { - String [] cleaned; + String[] cleaned; cleaned = new String[includes.length]; for ( int i = 0; i < includes.length; i++ ) { @@ -142,10 +142,10 @@ private String asPattern( @Nonnull String pPattern ) public void setExcludes( @Nullable String[] excludes ) { this.excludes = excludes; - final String[] defaultExcludes = useDefaultExcludes ? FileUtils.getDefaultExcludes() : new String []{}; + final String[] defaultExcludes = useDefaultExcludes ? FileUtils.getDefaultExcludes() : new String[] {}; if ( excludes == null ) { - computedExcludes = MatchPatterns.from( defaultExcludes); + computedExcludes = MatchPatterns.from( defaultExcludes ); } else { @@ -159,7 +159,7 @@ public void setExcludes( @Nullable String[] excludes ) { System.arraycopy( defaultExcludes, 0, temp, excludes.length, defaultExcludes.length ); } - computedExcludes = MatchPatterns.from( temp ); + computedExcludes = MatchPatterns.from( temp ); } } diff --git a/src/main/java/org/codehaus/plexus/components/io/functions/InputStreamTransformer.java b/src/main/java/org/codehaus/plexus/components/io/functions/InputStreamTransformer.java index ace288ed..f0073dbf 100644 --- a/src/main/java/org/codehaus/plexus/components/io/functions/InputStreamTransformer.java +++ b/src/main/java/org/codehaus/plexus/components/io/functions/InputStreamTransformer.java @@ -25,7 +25,8 @@ * Transform a stream into some other kind of stream. May be used to apply filtering or other * kinds of transformations. */ -public interface InputStreamTransformer { +public interface InputStreamTransformer +{ /** * Transform the supplied input stream into another input stream. * diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoArchiveResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoArchiveResourceCollection.java index 40f5b659..fbefccf7 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoArchiveResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoArchiveResourceCollection.java @@ -39,7 +39,7 @@ protected AbstractPlexusIoArchiveResourceCollection() { } - /** + /** * Sets the zip file */ public void setFile( File file ) @@ -68,8 +68,10 @@ public Iterator getResources() throws IOException } class FilteringIterator - implements Iterator, Closeable { - final Iterator it = getEntries(); + implements Iterator, Closeable + { + final Iterator it = getEntries(); + PlexusIoResource next; public FilteringIterator() @@ -79,11 +81,13 @@ public FilteringIterator() boolean doNext() { - while (it.hasNext()){ + while ( it.hasNext() ) + { PlexusIoResource candidate = it.next(); try { - if (isSelected( candidate )){ + if ( isSelected( candidate ) ) + { next = candidate; return true; } @@ -102,7 +106,8 @@ public boolean hasNext() public PlexusIoResource next() { - if (next == null) doNext(); + if ( next == null ) + doNext(); PlexusIoResource res = next; next = null; return res; @@ -110,14 +115,15 @@ public PlexusIoResource next() public void remove() { - throw new UnsupportedOperationException( ); + throw new UnsupportedOperationException(); } public void close() throws IOException { - if ( it instanceof Closeable){ - ((Closeable) it ).close(); + if ( it instanceof Closeable ) + { + ( (Closeable) it ).close(); } } } @@ -130,17 +136,17 @@ public void forEach( PlexusIoResourceConsumer resourceConsumer ) { final Iterator it = getEntries(); - while( it.hasNext()) + while ( it.hasNext() ) { final PlexusIoResource res = it.next(); if ( isSelected( res ) ) { - resourceConsumer.accept( res ); + resourceConsumer.accept( res ); } } - if (it instanceof Closeable ) + if ( it instanceof Closeable ) { - ((Closeable)it).close(); + ( (Closeable) it ).close(); } } }; diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResource.java b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResource.java index e297f84c..736c4d32 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResource.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResource.java @@ -16,7 +16,6 @@ * limitations under the License. */ - import javax.annotation.Nonnull; /** @@ -30,8 +29,8 @@ public abstract class AbstractPlexusIoResource implements PlexusIoResource private final boolean isFile, isDirectory, isExisting; - protected AbstractPlexusIoResource( @Nonnull String name, long lastModified, long size, boolean isFile, boolean isDirectory, - boolean isExisting ) + protected AbstractPlexusIoResource( @Nonnull String name, long lastModified, long size, boolean isFile, + boolean isDirectory, boolean isExisting ) { this.name = name; this.lastModified = lastModified; @@ -47,7 +46,7 @@ public long getLastModified() } @Nonnull - public String getName() + public String getName() { return name; } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java index 21eb6af4..431b762e 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollection.java @@ -26,7 +26,6 @@ import java.io.InputStream; import java.util.Iterator; - /** * Default implementation of a resource collection. */ diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionWithAttributes.java b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionWithAttributes.java index 234f5194..e8bee2f5 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionWithAttributes.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionWithAttributes.java @@ -83,12 +83,12 @@ protected PlexusIoResourceAttributes mergeAttributes( PlexusIoResourceAttributes if ( isDirectory ) { currentAttrs = PlexusIoResourceAttributeUtils.mergeAttributes( getOverrideDirAttributes(), currentAttrs, - getDefaultDirAttributes() ); + getDefaultDirAttributes() ); } else { currentAttrs = PlexusIoResourceAttributeUtils.mergeAttributes( getOverrideFileAttributes(), currentAttrs, - getDefaultFileAttributes() ); + getDefaultFileAttributes() ); } return currentAttrs; } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/ClosingInputStream.java b/src/main/java/org/codehaus/plexus/components/io/resources/ClosingInputStream.java index 67ddcf83..8eb275ff 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/ClosingInputStream.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/ClosingInputStream.java @@ -4,12 +4,13 @@ import java.io.InputStream; /** -* @author Kristian Rosenvold -*/ + * @author Kristian Rosenvold + */ public class ClosingInputStream extends InputStream { private final InputStream target; + private final InputStream other; public ClosingInputStream( InputStream target, InputStream other ) @@ -18,55 +19,64 @@ public ClosingInputStream( InputStream target, InputStream other ) this.other = other; } - @Override public int read() + @Override + public int read() throws IOException { return target.read(); } - @Override public int read( byte[] b ) + @Override + public int read( byte[] b ) throws IOException { return target.read( b ); } - @Override public int read( byte[] b, int off, int len ) + @Override + public int read( byte[] b, int off, int len ) throws IOException { return target.read( b, off, len ); } - @Override public long skip( long n ) + @Override + public long skip( long n ) throws IOException { return target.skip( n ); } - @Override public int available() + @Override + public int available() throws IOException { return target.available(); } - @Override public void close() + @Override + public void close() throws IOException { other.close(); target.close(); } - @Override public void mark( int readlimit ) + @Override + public void mark( int readlimit ) { target.mark( readlimit ); } - @Override public void reset() + @Override + public void reset() throws IOException { target.reset(); } - @Override public boolean markSupported() + @Override + public boolean markSupported() { return target.markSupported(); } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/Deferred.java b/src/main/java/org/codehaus/plexus/components/io/resources/Deferred.java index 7dcf35a8..77b4af1e 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/Deferred.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/Deferred.java @@ -65,7 +65,8 @@ public InputStream getContents() } else { - return new FileInputStream( dfos.getFile() ){ + return new FileInputStream( dfos.getFile() ) + { @Override public void close() throws IOException @@ -98,10 +99,9 @@ public String getName() return owner.getName( resource ); } - public PlexusIoResource asResource() { - return ProxyFactory.createProxy( resource, Deferred.this); + return ProxyFactory.createProxy( resource, Deferred.this ); } } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java b/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java index 55f0f8ea..ffaa6dcc 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/EncodingSupported.java @@ -27,5 +27,5 @@ public interface EncodingSupported * Supplies the encoding to be used for decoding filenames/paths * @param charset The charset to use */ - public void setEncoding(Charset charset); + public void setEncoding( Charset charset ); } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoArchivedResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoArchivedResourceCollection.java index 3564ff03..e1497783 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoArchivedResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoArchivedResourceCollection.java @@ -18,7 +18,6 @@ import java.io.File; - /** * Extension of {@link PlexusIoResourceCollection} for archive * files: Zip, tar, gzip, bzip2, etc. files. diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoCompressedFileResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoCompressedFileResourceCollection.java index 3a1f1678..8be86877 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoCompressedFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoCompressedFileResourceCollection.java @@ -66,7 +66,6 @@ public void setPath( String path ) } - // return the file attributes of the uncompressed file // may be null. protected abstract PlexusIoResourceAttributes getAttributes( File f ) @@ -86,13 +85,13 @@ public void forEach( PlexusIoResourceConsumer resourceConsumer ) { final Iterator it = getResources(); - while( it.hasNext()) + while ( it.hasNext() ) { resourceConsumer.accept( it.next() ); } - if (it instanceof Closeable ) + if ( it instanceof Closeable ) { - ((Closeable)it).close(); + ( (Closeable) it ).close(); } } }; @@ -187,8 +186,9 @@ public long getLastModified() return f == null ? PlexusIoResource.UNKNOWN_MODIFICATION_DATE : f.lastModified(); } - public boolean isConcurrentAccessSupported() { - // There is a single resource in the collection so it is safe - return true; + public boolean isConcurrentAccessSupported() + { + // There is a single resource in the collection so it is safe + return true; } } \ No newline at end of file diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java index 53000b72..f251b784 100755 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResource.java @@ -52,15 +52,16 @@ public class PlexusIoFileResource private final DeferredFileOutputStream dfos; - - protected PlexusIoFileResource( @Nonnull File file, @Nonnull String name, @Nonnull PlexusIoResourceAttributes attrs ) + protected PlexusIoFileResource( @Nonnull File file, @Nonnull String name, + @Nonnull PlexusIoResourceAttributes attrs ) throws IOException { - this( file, name, attrs, null, null ); + this( file, name, attrs, null, null ); } @SuppressWarnings( "ConstantConditions" ) - PlexusIoFileResource( @Nonnull final File file, @Nonnull String name, @Nonnull PlexusIoResourceAttributes attrs, final ContentSupplier contentSupplier, final InputStreamTransformer streamTransformer ) + PlexusIoFileResource( @Nonnull final File file, @Nonnull String name, @Nonnull PlexusIoResourceAttributes attrs, + final ContentSupplier contentSupplier, final InputStreamTransformer streamTransformer ) throws IOException { super( name, file.lastModified(), file.length(), file.isFile(), file.isDirectory(), file.exists() ); @@ -72,12 +73,14 @@ protected PlexusIoFileResource( @Nonnull File file, @Nonnull String name, @Nonnu InputStreamTransformer transToUse = streamTransformer != null ? streamTransformer : identityTransformer; dfos = hasTransformer && file.isFile() ? asDeferredStream( this.contentSupplier, transToUse, this ) : null; - if (attrs == null) throw new IllegalArgumentException( "attrs is null for file " + file.getName() ); + if ( attrs == null ) + throw new IllegalArgumentException( "attrs is null for file " + file.getName() ); this.attributes = attrs; } - private static DeferredFileOutputStream asDeferredStream( @Nonnull ContentSupplier supplier, @Nonnull InputStreamTransformer transToUse, - PlexusIoResource resource ) + private static DeferredFileOutputStream asDeferredStream( @Nonnull ContentSupplier supplier, + @Nonnull InputStreamTransformer transToUse, + PlexusIoResource resource ) throws IOException { DeferredFileOutputStream dfos = new DeferredFileOutputStream( 5000000, "p-archiver", null, null ); @@ -89,13 +92,14 @@ private static DeferredFileOutputStream asDeferredStream( @Nonnull ContentSuppli return dfos; } - private static ContentSupplier getRootContentSupplier(final File file){ + private static ContentSupplier getRootContentSupplier( final File file ) + { return new ContentSupplier() { public InputStream getContents() throws IOException { - return new FileInputStream( file); + return new FileInputStream( file ); } }; } @@ -118,28 +122,28 @@ public File getFile() public InputStream getContents() throws IOException { - if ( dfos == null ) - { - return contentSupplier.getContents(); - } - if ( dfos.isInMemory() ) - { - return new ByteArrayInputStream( dfos.getData() ); - } - else + if ( dfos == null ) + { + return contentSupplier.getContents(); + } + if ( dfos.isInMemory() ) + { + return new ByteArrayInputStream( dfos.getData() ); + } + else + { + return new FileInputStream( dfos.getFile() ) { - return new FileInputStream( dfos.getFile() ) + @SuppressWarnings( "ResultOfMethodCallIgnored" ) + @Override + public void close() + throws IOException { - @SuppressWarnings( "ResultOfMethodCallIgnored" ) - @Override - public void close() - throws IOException - { - super.close(); - dfos.getFile().delete(); - } - }; - } + super.close(); + dfos.getFile().delete(); + } + }; + } } @Nonnull @@ -180,7 +184,8 @@ public boolean isFile() return getFile().isFile(); } - @Nonnull public PlexusIoResourceAttributes getAttributes() + @Nonnull + public PlexusIoResourceAttributes getAttributes() { return attributes; } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java index 91b0cef2..3fe7b952 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoFileResourceCollection.java @@ -113,9 +113,9 @@ public void setFollowingSymLinks( boolean pIsFollowingSymLinks ) public void setDefaultAttributes( final int uid, final String userName, final int gid, final String groupName, final int fileMode, final int dirMode ) { - setDefaultFileAttributes( createDefaults(uid, userName, gid, groupName, fileMode) ); + setDefaultFileAttributes( createDefaults( uid, userName, gid, groupName, fileMode ) ); - setDefaultDirAttributes( createDefaults(uid, userName, gid, groupName, dirMode) ); + setDefaultDirAttributes( createDefaults( uid, userName, gid, groupName, dirMode ) ); } public void setOverrideAttributes( final int uid, final String userName, final int gid, final String groupName, @@ -123,7 +123,7 @@ public void setOverrideAttributes( final int uid, final String userName, final i { setOverrideFileAttributes( createDefaults( uid, userName, gid, groupName, fileMode ) ); - setOverrideDirAttributes( createDefaults(uid, userName, gid, groupName, dirMode) ); + setOverrideDirAttributes( createDefaults( uid, userName, gid, groupName, dirMode ) ); } private static PlexusIoResourceAttributes createDefaults( final int uid, final String userName, final int gid, @@ -135,9 +135,10 @@ private static PlexusIoResourceAttributes createDefaults( final int uid, final S @Override - public void setPrefix(String prefix) { - char nonSeparator = File.separatorChar == '/' ?'\\' : '/'; - super.setPrefix(StringUtils.replace( prefix, nonSeparator, File.separatorChar)); + public void setPrefix( String prefix ) + { + char nonSeparator = File.separatorChar == '/' ? '\\' : '/'; + super.setPrefix( StringUtils.replace( prefix, nonSeparator, File.separatorChar ) ); } private void addResources( List result, String[] resources ) @@ -157,7 +158,8 @@ private void addResources( List result, String[] resources ) String remappedName = getName( name ); - PlexusIoResource resource = ResourceFactory.createResource( f, remappedName, null, getStreamTransformer(), attrs ); + PlexusIoResource resource = + ResourceFactory.createResource( f, remappedName, null, getStreamTransformer(), attrs ); if ( isSelected( resource ) ) { @@ -253,7 +255,8 @@ public Iterator getResources() return result.iterator(); } - public boolean isConcurrentAccessSupported() { - return true; + public boolean isConcurrentAccessSupported() + { + return true; } } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java index 0b7bc1b8..32051cb5 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoResourceCollection.java @@ -49,15 +49,13 @@ public interface PlexusIoResourceCollection extends Iterable */ public Stream stream(); - - - /** - * Returns the resources suggested name. This is used for - * integrating file mappers. - * @param resource A resource, which has been obtained by - * calling {@link #getResources()}. - * @return The resource name. If it is a file, it should be normalized to platform separators - */ + /** + * Returns the resources suggested name. This is used for + * integrating file mappers. + * @param resource A resource, which has been obtained by + * calling {@link #getResources()}. + * @return The resource name. If it is a file, it should be normalized to platform separators + */ String getName( PlexusIoResource resource ); /** diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoSymlinkResource.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoSymlinkResource.java index f662d1de..05a24cfd 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoSymlinkResource.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoSymlinkResource.java @@ -17,7 +17,7 @@ public class PlexusIoSymlinkResource PlexusIoSymlinkResource( @Nonnull File symlinkfile, String name, @Nonnull PlexusIoResourceAttributes attrs ) throws IOException { - super( symlinkfile, name, attrs); + super( symlinkfile, name, attrs ); this.symnlinkDestination = null; } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java index 97373374..d840b9e7 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/PlexusIoURLResource.java @@ -25,8 +25,8 @@ public abstract class PlexusIoURLResource extends AbstractPlexusIoResource { - protected PlexusIoURLResource( @Nonnull String name, long lastModified, long size, boolean isFile, boolean isDirectory, - boolean isExisting ) + protected PlexusIoURLResource( @Nonnull String name, long lastModified, long size, boolean isFile, + boolean isDirectory, boolean isExisting ) { super( name, lastModified, size, isFile, isDirectory, isExisting ); } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/ResourceFactory.java b/src/main/java/org/codehaus/plexus/components/io/resources/ResourceFactory.java index ec47857f..a482a32a 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/ResourceFactory.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/ResourceFactory.java @@ -18,7 +18,7 @@ public class ResourceFactory public static PlexusIoResource createResource( File f ) throws IOException { - return createResource( f, getName( f ), null, null, getFileAttributes( f ) ); + return createResource( f, getName( f ), null, null, getFileAttributes( f ) ); } public static PlexusIoResource createResource( File f, String name ) @@ -31,7 +31,7 @@ public static PlexusIoResource createResource( File f, String name, final Conten PlexusIoResourceAttributes attributes ) throws IOException { - return createResource( f, name, contentSupplier, null, attributes ); + return createResource( f, name, contentSupplier, null, attributes ); } public static PlexusIoResource createResource( File f, InputStreamTransformer inputStreamTransformer ) @@ -40,8 +40,8 @@ public static PlexusIoResource createResource( File f, InputStreamTransformer in return createResource( f, getName( f ), null, inputStreamTransformer, getFileAttributes( f ) ); } - public static PlexusIoResource createResource( File f, String name, final ContentSupplier contentSupplier, - InputStreamTransformer inputStreamTransformer ) + public static PlexusIoResource createResource( File f, String name, final ContentSupplier contentSupplier, + InputStreamTransformer inputStreamTransformer ) throws IOException { return createResource( f, name, contentSupplier, inputStreamTransformer, getFileAttributes( f ) ); diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java b/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java index a6b0b627..e3576d1f 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/Stream.java @@ -26,6 +26,6 @@ public interface Stream * @param resourceConsumer The consumer of the resource * @throws java.io.IOException . */ - public void forEach(PlexusIoResourceConsumer resourceConsumer) throws IOException; + public void forEach( PlexusIoResourceConsumer resourceConsumer ) throws IOException; } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollection.java b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollection.java index 3ca8d192..61c16d80 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollection.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollection.java @@ -50,7 +50,7 @@ public PlexusIoProxyResourceCollection( @Nonnull PlexusIoResourceCollection src this.src = src; } - /** + /** * Returns the archive to read. */ public PlexusIoResourceCollection getSrc() @@ -77,8 +77,9 @@ public void setOverrideAttributes( final int uid, final String userName, final i @Override public void setStreamTransformer( InputStreamTransformer streamTransformer ) { - if (src instanceof AbstractPlexusIoResourceCollection ){ - ((AbstractPlexusIoResourceCollection)src).setStreamTransformer( streamTransformer ); + if ( src instanceof AbstractPlexusIoResourceCollection ) + { + ( (AbstractPlexusIoResourceCollection) src ).setStreamTransformer( streamTransformer ); } super.setStreamTransformer( streamTransformer ); } @@ -93,15 +94,17 @@ protected FileSelector getDefaultFileSelector() return fileSelector; } - private String getNonEmptyPrfix(){ - String prefix = getPrefix(); - if ( prefix != null && prefix.length() == 0 ) - { - return null; - } - return prefix; + private String getNonEmptyPrfix() + { + String prefix = getPrefix(); + if ( prefix != null && prefix.length() == 0 ) + { + return null; + } + return prefix; + + } - } class FwdIterator extends ForwardingIterator { @@ -113,7 +116,7 @@ class FwdIterator FwdIterator( Iterator resources ) { - super( resources); + super( resources ); this.iter = resources; } @@ -123,13 +126,15 @@ class FwdIterator protected PlexusIoResource getNextResource() throws IOException { - if (!iter.hasNext()) return null; + if ( !iter.hasNext() ) + return null; PlexusIoResource plexusIoResource = iter.next(); - while ( (!fileSelector.isSelected( plexusIoResource ) || !isSelected( plexusIoResource )) - || (plexusIoResource.isDirectory() && !isIncludingEmptyDirectories())) + while ( ( !fileSelector.isSelected( plexusIoResource ) || !isSelected( plexusIoResource ) ) + || ( plexusIoResource.isDirectory() && !isIncludingEmptyDirectories() ) ) { - if (!iter.hasNext()) return null; + if ( !iter.hasNext() ) + return null; plexusIoResource = iter.next(); } @@ -143,13 +148,13 @@ protected PlexusIoResource getNextResource() attrs = SimpleResourceAttributes.lastResortDummyAttributesForBrokenOS(); } - attrs = mergeAttributes(attrs, plexusIoResource.isDirectory()); + attrs = mergeAttributes( attrs, plexusIoResource.isDirectory() ); if ( prefix != null ) { final String name = plexusIoResource.getName(); - final PlexusIoResourceAttributes attrs2= attrs; + final PlexusIoResourceAttributes attrs2 = attrs; DualSupplier supplier = new DualSupplier() { public String getName() @@ -179,9 +184,12 @@ public Iterator getResources() return new FwdIterator( getSrc().getResources() ); } - abstract static class DualSupplier implements NameSupplier, ResourceAttributeSupplier { + abstract static class DualSupplier + implements NameSupplier, ResourceAttributeSupplier + { } + public String getName( final PlexusIoResource resource ) { String name = resource.getName(); @@ -208,12 +216,14 @@ public long getLastModified() public void setEncoding( Charset charset ) { - if (src instanceof EncodingSupported){ - ((EncodingSupported)src).setEncoding( charset ); + if ( src instanceof EncodingSupported ) + { + ( (EncodingSupported) src ).setEncoding( charset ); } } - public boolean isConcurrentAccessSupported() { - return src.isConcurrentAccessSupported(); + public boolean isConcurrentAccessSupported() + { + return src.isConcurrentAccessSupported(); } } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java index 5e06a9ea..15597b03 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactory.java @@ -27,17 +27,20 @@ public class ProxyFactory { - public static PlexusIoResource createProxy(@Nonnull PlexusIoResource target, Object alternateSupplier) + public static PlexusIoResource createProxy( @Nonnull PlexusIoResource target, Object alternateSupplier ) { - List interfaces = new ArrayList<>( ); - interfaces.add( PlexusIoResource.class); - if (target instanceof SymlinkDestinationSupplier ) interfaces.add( SymlinkDestinationSupplier.class); - if (target instanceof FileSupplier ) interfaces.add( FileSupplier.class); - if (target instanceof ResourceAttributeSupplier) interfaces.add( ResourceAttributeSupplier.class); + List interfaces = new ArrayList<>(); + interfaces.add( PlexusIoResource.class ); + if ( target instanceof SymlinkDestinationSupplier ) + interfaces.add( SymlinkDestinationSupplier.class ); + if ( target instanceof FileSupplier ) + interfaces.add( FileSupplier.class ); + if ( target instanceof ResourceAttributeSupplier ) + interfaces.add( ResourceAttributeSupplier.class ); return (PlexusIoResource) Proxy.newProxyInstance( PlexusIoResource.class.getClassLoader(), - interfaces.toArray(new Class[interfaces.size()]), - new ResourceInvocationHandler( target, alternateSupplier) ); + interfaces.toArray( new Class[interfaces.size()] ), + new ResourceInvocationHandler( target, alternateSupplier ) ); } } diff --git a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ResourceInvocationHandler.java b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ResourceInvocationHandler.java index 99aed300..d8601757 100644 --- a/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ResourceInvocationHandler.java +++ b/src/main/java/org/codehaus/plexus/components/io/resources/proxy/ResourceInvocationHandler.java @@ -41,37 +41,45 @@ public ResourceInvocationHandler( @Nonnull PlexusIoResource target, Object alter { this.testImpl = target; this.contentSupplier = asOrNull( alternativeHandler, ContentSupplier.class ); - this.nameSupplier = asOrNull( alternativeHandler, NameSupplier.class ); - this.sizeSupplier = asOrNull( alternativeHandler, SizeSupplier.class); - this.symlinkDestinationSupplier = asOrNull( alternativeHandler, SymlinkDestinationSupplier.class); - this.resourceAttributeSupplier = asOrNull( alternativeHandler, ResourceAttributeSupplier.class); + this.nameSupplier = asOrNull( alternativeHandler, NameSupplier.class ); + this.sizeSupplier = asOrNull( alternativeHandler, SizeSupplier.class ); + this.symlinkDestinationSupplier = asOrNull( alternativeHandler, SymlinkDestinationSupplier.class ); + this.resourceAttributeSupplier = asOrNull( alternativeHandler, ResourceAttributeSupplier.class ); } @SuppressWarnings( "unchecked" ) - private static T asOrNull(Object instance, Class clazz){ - if (instance != null && clazz.isAssignableFrom( instance.getClass())) return (T) instance; - else return null; + private static T asOrNull( Object instance, Class clazz ) + { + if ( instance != null && clazz.isAssignableFrom( instance.getClass() ) ) + return (T) instance; + else + return null; } public Object invoke( Object proxy, Method method, Object[] args ) throws Throwable { String name = method.getName(); - if (contentSupplier != null && "getContents".equals( name )){ + if ( contentSupplier != null && "getContents".equals( name ) ) + { return contentSupplier.getContents(); } - if (nameSupplier != null && "getName".equals( name )){ + if ( nameSupplier != null && "getName".equals( name ) ) + { return nameSupplier.getName(); } - if (sizeSupplier != null && "getSize".equals( name )){ + if ( sizeSupplier != null && "getSize".equals( name ) ) + { return sizeSupplier.getSize(); } - if (symlinkDestinationSupplier != null && "getSymlinkDestination".equals( name )){ + if ( symlinkDestinationSupplier != null && "getSymlinkDestination".equals( name ) ) + { return symlinkDestinationSupplier.getSymlinkDestination(); } - if (resourceAttributeSupplier != null && "getAttributes".equals( name )){ + if ( resourceAttributeSupplier != null && "getAttributes".equals( name ) ) + { return resourceAttributeSupplier.getAttributes(); } diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java b/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java index aa17d3ab..0e0351ba 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java @@ -33,85 +33,84 @@ protected AbstractResourceAttributesTCK() public final void testSetOctalModeString_OwnerModes() { - verifyStringOctalModeSet( "700", new boolean[]{ true, true, true, false, false, false, false, false, false } ); - verifyStringOctalModeSet( "600", new boolean[]{ true, true, false, false, false, false, false, false, false } ); - verifyStringOctalModeSet( "400", new boolean[]{ true, false, false, false, false, false, false, false, false } ); - verifyStringOctalModeSet( "200", new boolean[]{ false, true, false, false, false, false, false, false, false } ); + verifyStringOctalModeSet( "700", new boolean[] { true, true, true, false, false, false, false, false, false } ); + verifyStringOctalModeSet( "600", new boolean[] { true, true, false, false, false, false, false, false, false } ); + verifyStringOctalModeSet( "400", new boolean[] { true, false, false, false, false, false, false, false, false } ); + verifyStringOctalModeSet( "200", new boolean[] { false, true, false, false, false, false, false, false, false } ); } public final void testSetOctalModeString_GroupModes() { - verifyStringOctalModeSet( "070", new boolean[]{ false, false, false, true, true, true, false, false, false } ); - verifyStringOctalModeSet( "060", new boolean[]{ false, false, false, true, true, false, false, false, false } ); - verifyStringOctalModeSet( "040", new boolean[]{ false, false, false, true, false, false, false, false, false } ); - verifyStringOctalModeSet( "020", new boolean[]{ false, false, false, false, true, false, false, false, false } ); + verifyStringOctalModeSet( "070", new boolean[] { false, false, false, true, true, true, false, false, false } ); + verifyStringOctalModeSet( "060", new boolean[] { false, false, false, true, true, false, false, false, false } ); + verifyStringOctalModeSet( "040", new boolean[] { false, false, false, true, false, false, false, false, false } ); + verifyStringOctalModeSet( "020", new boolean[] { false, false, false, false, true, false, false, false, false } ); } public final void testSetOctalModeString_WorldModes() { - verifyStringOctalModeSet( "007", new boolean[]{ false, false, false, false, false, false, true, true, true } ); - verifyStringOctalModeSet( "006", new boolean[]{ false, false, false, false, false, false, true, true, false } ); - verifyStringOctalModeSet( "004", new boolean[]{ false, false, false, false, false, false, true, false, false } ); - verifyStringOctalModeSet( "002", new boolean[]{ false, false, false, false, false, false, false, true, false } ); + verifyStringOctalModeSet( "007", new boolean[] { false, false, false, false, false, false, true, true, true } ); + verifyStringOctalModeSet( "006", new boolean[] { false, false, false, false, false, false, true, true, false } ); + verifyStringOctalModeSet( "004", new boolean[] { false, false, false, false, false, false, true, false, false } ); + verifyStringOctalModeSet( "002", new boolean[] { false, false, false, false, false, false, false, true, false } ); } public final void testSetOctalMode_OwnerModes() { - verifyOctalModeSet( "700", new boolean[]{ true, true, true, false, false, false, false, false, false } ); - verifyOctalModeSet( "600", new boolean[]{ true, true, false, false, false, false, false, false, false } ); - verifyOctalModeSet( "400", new boolean[]{ true, false, false, false, false, false, false, false, false } ); - verifyOctalModeSet( "200", new boolean[]{ false, true, false, false, false, false, false, false, false } ); + verifyOctalModeSet( "700", new boolean[] { true, true, true, false, false, false, false, false, false } ); + verifyOctalModeSet( "600", new boolean[] { true, true, false, false, false, false, false, false, false } ); + verifyOctalModeSet( "400", new boolean[] { true, false, false, false, false, false, false, false, false } ); + verifyOctalModeSet( "200", new boolean[] { false, true, false, false, false, false, false, false, false } ); } public final void testSetOctalMode_GroupModes() { - verifyOctalModeSet( "070", new boolean[]{ false, false, false, true, true, true, false, false, false } ); - verifyOctalModeSet( "060", new boolean[]{ false, false, false, true, true, false, false, false, false } ); - verifyOctalModeSet( "040", new boolean[]{ false, false, false, true, false, false, false, false, false } ); - verifyOctalModeSet( "020", new boolean[]{ false, false, false, false, true, false, false, false, false } ); + verifyOctalModeSet( "070", new boolean[] { false, false, false, true, true, true, false, false, false } ); + verifyOctalModeSet( "060", new boolean[] { false, false, false, true, true, false, false, false, false } ); + verifyOctalModeSet( "040", new boolean[] { false, false, false, true, false, false, false, false, false } ); + verifyOctalModeSet( "020", new boolean[] { false, false, false, false, true, false, false, false, false } ); } public final void testSetOctalMode_WorldModes() { - verifyOctalModeSet( "007", new boolean[]{ false, false, false, false, false, false, true, true, true } ); - verifyOctalModeSet( "006", new boolean[]{ false, false, false, false, false, false, true, true, false } ); - verifyOctalModeSet( "004", new boolean[]{ false, false, false, false, false, false, true, false, false } ); - verifyOctalModeSet( "002", new boolean[]{ false, false, false, false, false, false, false, true, false } ); + verifyOctalModeSet( "007", new boolean[] { false, false, false, false, false, false, true, true, true } ); + verifyOctalModeSet( "006", new boolean[] { false, false, false, false, false, false, true, true, false } ); + verifyOctalModeSet( "004", new boolean[] { false, false, false, false, false, false, true, false, false } ); + verifyOctalModeSet( "002", new boolean[] { false, false, false, false, false, false, false, true, false } ); } private void verifyStringOctalModeSet( String mode, boolean[] checkValues ) { PlexusIoResourceAttributes attrs = newAttributes( Integer.parseInt( mode, 8 ) ); - + assertEquals( checkValues[0], attrs.isOwnerReadable() ); assertEquals( checkValues[1], attrs.isOwnerWritable() ); assertEquals( checkValues[2], attrs.isOwnerExecutable() ); - + assertEquals( checkValues[3], attrs.isGroupReadable() ); assertEquals( checkValues[4], attrs.isGroupWritable() ); assertEquals( checkValues[5], attrs.isGroupExecutable() ); - + assertEquals( checkValues[6], attrs.isWorldReadable() ); assertEquals( checkValues[7], attrs.isWorldWritable() ); assertEquals( checkValues[8], attrs.isWorldExecutable() ); } - + private void verifyOctalModeSet( String mode, boolean[] checkValues ) { - PlexusIoResourceAttributes attrs = newAttributes(Integer.parseInt( mode, 8 )); - + PlexusIoResourceAttributes attrs = newAttributes( Integer.parseInt( mode, 8 ) ); assertEquals( checkValues[0], attrs.isOwnerReadable() ); assertEquals( checkValues[1], attrs.isOwnerWritable() ); assertEquals( checkValues[2], attrs.isOwnerExecutable() ); - + assertEquals( checkValues[3], attrs.isGroupReadable() ); assertEquals( checkValues[4], attrs.isGroupWritable() ); assertEquals( checkValues[5], attrs.isGroupExecutable() ); - + assertEquals( checkValues[6], attrs.isWorldReadable() ); assertEquals( checkValues[7], attrs.isWorldWritable() ); assertEquals( checkValues[8], attrs.isWorldExecutable() ); } - + } \ No newline at end of file diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java index 6dfcb2f7..dee75ad5 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java @@ -20,47 +20,48 @@ public void testMiscPatterns() { final Set permissions = AttributeUtils.getPermissions( 0124 ); assertTrue( permissions.contains( PosixFilePermission.OWNER_EXECUTE ) ); - assertTrue(permissions.contains( PosixFilePermission.GROUP_WRITE )); - assertTrue(permissions.contains( PosixFilePermission.OTHERS_READ )); + assertTrue( permissions.contains( PosixFilePermission.GROUP_WRITE ) ); + assertTrue( permissions.contains( PosixFilePermission.OTHERS_READ ) ); } - public void testMorePatterns() - throws Exception + public void testMorePatterns() throws Exception { final Set permissions = AttributeUtils.getPermissions( 0241 ); - assertTrue(permissions.contains( PosixFilePermission.OWNER_WRITE )); - assertTrue(permissions.contains( PosixFilePermission.GROUP_READ )); - assertTrue(permissions.contains( PosixFilePermission.OTHERS_EXECUTE )); + assertTrue( permissions.contains( PosixFilePermission.OWNER_WRITE ) ); + assertTrue( permissions.contains( PosixFilePermission.GROUP_READ ) ); + assertTrue( permissions.contains( PosixFilePermission.OTHERS_EXECUTE ) ); } - public void testEvenMorePatterns() - throws Exception + public void testEvenMorePatterns() throws Exception { final Set permissions = AttributeUtils.getPermissions( 0412 ); - assertTrue(permissions.contains( PosixFilePermission.OWNER_READ )); - assertTrue(permissions.contains( PosixFilePermission.GROUP_EXECUTE )); - assertTrue(permissions.contains( PosixFilePermission.OTHERS_WRITE )); + assertTrue( permissions.contains( PosixFilePermission.OWNER_READ ) ); + assertTrue( permissions.contains( PosixFilePermission.GROUP_EXECUTE ) ); + assertTrue( permissions.contains( PosixFilePermission.OTHERS_WRITE ) ); } public void test777() throws Exception { final Set permissions = AttributeUtils.getPermissions( 0777 ); - assertTrue( permissions.size() == 9); + assertTrue( permissions.size() == 9 ); } - + public void testChmodBackAndForth() throws IOException { - if ( Os.isFamily( Os.FAMILY_WINDOWS )) return; + if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) + return; final File bxx = File.createTempFile( "bxx", "ff" ); AttributeUtils.chmod( bxx, 0422 ); - PlexusIoResourceAttributes firstAttrs = new FileAttributes( bxx, new HashMap( ), new HashMap( ) ); + PlexusIoResourceAttributes firstAttrs = + new FileAttributes( bxx, new HashMap(), new HashMap() ); assertTrue( firstAttrs.isOwnerReadable() ); assertFalse( firstAttrs.isOwnerWritable() ); assertFalse( firstAttrs.isOwnerExecutable() ); AttributeUtils.chmod( bxx, 0777 ); - PlexusIoResourceAttributes secondAttrs = new FileAttributes( bxx, new HashMap( ), new HashMap( ) ); + PlexusIoResourceAttributes secondAttrs = + new FileAttributes( bxx, new HashMap(), new HashMap() ); assertTrue( secondAttrs.isOwnerReadable() ); assertTrue( secondAttrs.isOwnerWritable() ); assertTrue( secondAttrs.isOwnerExecutable() ); diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java index 66e51ba2..573fb2d8 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java @@ -68,9 +68,11 @@ public void testGetAttributesForThisTestClass() } public void testDirectory() - throws IOException, CommandLineException { + throws IOException, CommandLineException + { - if (Os.isFamily( Os.FAMILY_WINDOWS )){ + if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) + { return; // Nothing to do here. } @@ -86,57 +88,61 @@ public void testDirectory() File f = new File( resource.getPath().replaceAll( "%20", " " ) ); final File aDir = f.getParentFile().getParentFile().getParentFile(); - Commandline commandLine = new Commandline("chmod"); - commandLine.addArguments(new String[]{"763", f.getAbsolutePath()}); + Commandline commandLine = new Commandline( "chmod" ); + commandLine.addArguments( new String[] { "763", f.getAbsolutePath() } ); - CommandLineUtils.executeCommandLine(commandLine, null , null); + CommandLineUtils.executeCommandLine( commandLine, null, null ); Map attrs = PlexusIoResourceAttributeUtils.getFileAttributesByPath( aDir, true ); PlexusIoResourceAttributes fileAttrs = attrs.get( f.getAbsolutePath() ); - assertTrue( fileAttrs.isGroupReadable()); - assertTrue( fileAttrs.isGroupWritable()); - assertFalse( fileAttrs.isGroupExecutable()); + assertTrue( fileAttrs.isGroupReadable() ); + assertTrue( fileAttrs.isGroupWritable() ); + assertFalse( fileAttrs.isGroupExecutable() ); - assertTrue( fileAttrs.isOwnerExecutable()); - assertTrue( fileAttrs.isOwnerReadable()); - assertTrue( fileAttrs.isOwnerWritable()); + assertTrue( fileAttrs.isOwnerExecutable() ); + assertTrue( fileAttrs.isOwnerReadable() ); + assertTrue( fileAttrs.isOwnerWritable() ); - assertTrue( fileAttrs.isWorldExecutable()); - assertFalse( fileAttrs.isWorldReadable()); - assertTrue( fileAttrs.isWorldWritable()); + assertTrue( fileAttrs.isWorldExecutable() ); + assertFalse( fileAttrs.isWorldReadable() ); + assertTrue( fileAttrs.isWorldWritable() ); - assertNotNull(fileAttrs); + assertNotNull( fileAttrs ); } public void testSrcResource() - throws IOException + throws IOException { - if (Os.isFamily( Os.FAMILY_WINDOWS )){ + if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) + { return; // Nothing to do here. } - File dir = new File("src/test/resources/symlinks"); + File dir = new File( "src/test/resources/symlinks" ); final Map fileAttributesByPathScreenScrape = - PlexusIoResourceAttributeUtils.getFileAttributesByPath( dir, true ); - assertNotNull( fileAttributesByPathScreenScrape); + PlexusIoResourceAttributeUtils.getFileAttributesByPath( dir, true ); + assertNotNull( fileAttributesByPathScreenScrape ); PlexusIoResourceAttributes pr = null; for ( String s : fileAttributesByPathScreenScrape.keySet() ) { - if (s.endsWith( "targetFile.txt" )) pr = fileAttributesByPathScreenScrape.get( s); + if ( s.endsWith( "targetFile.txt" ) ) + pr = fileAttributesByPathScreenScrape.get( s ); } - assertNotNull(pr); + assertNotNull( pr ); - assertTrue(pr.getOctalMode() > 0); + assertTrue( pr.getOctalMode() > 0 ); } public void testNonExistingDirectory() { - File dir = new File("src/test/noSuchDirectory"); - try { + File dir = new File( "src/test/noSuchDirectory" ); + try + { PlexusIoResourceAttributeUtils.getFileAttributesByPath( dir, true ); - fail("We were supposed to get an io exceptions"); - } catch (IOException ignore) + fail( "We were supposed to get an io exceptions" ); + } + catch ( IOException ignore ) { ignore.printStackTrace(); } @@ -163,8 +169,8 @@ public void testMergeAttributesWithNullOverrideGroup() final PlexusIoResourceAttributes defaults = new SimpleResourceAttributes( 1000, "defaultUser", 1000, "defaultGroup", 0 ); - PlexusIoResourceAttributes attributes - = PlexusIoResourceAttributeUtils.mergeAttributes( override, null, defaults ); + PlexusIoResourceAttributes attributes = + PlexusIoResourceAttributeUtils.mergeAttributes( override, null, defaults ); assertEquals( attributes.getGroupId(), Integer.valueOf( 1000 ) ); assertEquals( attributes.getUserId(), Integer.valueOf( 1001 ) ); @@ -229,8 +235,7 @@ public void testMergeAttributesOverride() assertEquals( "testGroup", attributes.getGroupName() ); assertEquals( 0777, attributes.getOctalMode() ); - attributes = PlexusIoResourceAttributeUtils.mergeAttributes( - override, blank, null ); + attributes = PlexusIoResourceAttributeUtils.mergeAttributes( override, blank, null ); assertEquals( Integer.valueOf( 1111 ), attributes.getUserId() ); assertEquals( "testUser", attributes.getUserName() ); @@ -285,18 +290,18 @@ public void testFileAttributes() { PlexusIoResourceAttributes attrs = getFileAttributes( new File( "src/test/resources/symlinks/src/fileW.txt" ) ); assertFalse( attrs.isSymbolicLink() ); - assertTrue( StringUtils.isNotEmpty( attrs.getUserName())); - if (! Os.isFamily(Os.FAMILY_WINDOWS)) + assertTrue( StringUtils.isNotEmpty( attrs.getUserName() ) ); + if ( !Os.isFamily( Os.FAMILY_WINDOWS ) ) { - assertTrue( StringUtils.isNotEmpty( attrs.getGroupName())); - assertNotNull( attrs.getGroupId() ); - assertNotNull( attrs.getUserId() ); + assertTrue( StringUtils.isNotEmpty( attrs.getGroupName() ) ); + assertNotNull( attrs.getGroupId() ); + assertNotNull( attrs.getUserId() ); } } public void testMergeAttributesDefault() { - final PlexusIoResourceAttributes blank = new SimpleResourceAttributes(null, null, null, null, 0); + final PlexusIoResourceAttributes blank = new SimpleResourceAttributes( null, null, null, null, 0 ); final PlexusIoResourceAttributes invalid = new SimpleResourceAttributes( -1, null, -1, null, -1 ); final PlexusIoResourceAttributes defaults = new SimpleResourceAttributes( 3333, "defaultUser", 4444, "defaultGroup", 0444 ); diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributesTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributesTest.java index 57321ea4..9673f884 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributesTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/SimpleResourceAttributesTest.java @@ -16,7 +16,6 @@ * limitations under the License. */ - public class SimpleResourceAttributesTest extends AbstractResourceAttributesTCK { diff --git a/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java b/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java index e7284d04..0d1875d7 100644 --- a/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java @@ -28,16 +28,16 @@ public class SymlinkUtilsTest { - File target = new File( "target/symlinkCapabilities"); - String expected = "This is a filed that we'll be symlinking to\n"; + File target = new File( "target/symlinkCapabilities" ); + String expected = "This is a filed that we'll be symlinking to\n"; @Before public void setup() throws IOException { - FileUtils.deleteDirectory(target ); - Files.createDirectories(target.toPath()); + FileUtils.deleteDirectory( target ); + Files.createDirectories( target.toPath() ); } @Test @@ -51,31 +51,32 @@ public void testName() public void create_read_symbolic_link_to_file() throws Exception { - File symlink = new File( target, "symlinkToTarget"); + File symlink = new File( target, "symlinkToTarget" ); File relativePath = createTargetFile( target ); - SymlinkUtils.createSymbolicLink( symlink, relativePath); + SymlinkUtils.createSymbolicLink( symlink, relativePath ); assertEquals( expected, FileUtils.readFileToString( symlink ) ); - assertEquals( new File("actualFile"), SymlinkUtils.readSymbolicLink( new File(target, "symlinkToTarget") )); + assertEquals( new File( "actualFile" ), + SymlinkUtils.readSymbolicLink( new File( target, "symlinkToTarget" ) ) ); } @Test public void create_read_symbolic_link_to_directory() throws Exception { - File subDir = new File( target, "aSubDir"); + File subDir = new File( target, "aSubDir" ); createTargetFile( subDir ); - File symlink = new File( target, "symlinkToDir"); - SymlinkUtils.createSymbolicLink( symlink, new File("aSubDir")); - assertEquals( expected, FileUtils.readFileToString( new File(symlink, "actualFile" )) ); - assertEquals( new File("aSubDir"), SymlinkUtils.readSymbolicLink( new File(target, "symlinkToDir") )); + File symlink = new File( target, "symlinkToDir" ); + SymlinkUtils.createSymbolicLink( symlink, new File( "aSubDir" ) ); + assertEquals( expected, FileUtils.readFileToString( new File( symlink, "actualFile" ) ) ); + assertEquals( new File( "aSubDir" ), SymlinkUtils.readSymbolicLink( new File( target, "symlinkToDir" ) ) ); } private File createTargetFile( File target ) throws IOException { - File relativePath = new File("actualFile"); - File actualFile = new File( target, relativePath.getPath()); + File relativePath = new File( "actualFile" ); + File actualFile = new File( target, relativePath.getPath() ); FileUtils.write( actualFile, expected ); return relativePath; } diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java index 68985a1b..4830d7e7 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java @@ -150,9 +150,9 @@ public void testPrefixMapper() throws Exception final String[] results = getIdentityResults(); testFileMapper( new PrefixFileMapper(), SAMPLES, results ); testFileMapper( (PrefixFileMapper) lookup( FileMapper.ROLE, PrefixFileMapper.ROLE_HINT ), SAMPLES, results ); - for ( int i = 0; i < results.length; i++ ) + for ( int i = 0; i < results.length; i++ ) { - if ( results[i] != null ) + if ( results[i] != null ) { results[i] = prefix + results[i]; } @@ -165,11 +165,11 @@ public void testPrefixMapper() throws Exception testFileMapper( mapper, SAMPLES, results ); } - private RegExpFileMapper configure(RegExpFileMapper pMapper, String pPattern, String pReplacement) + private RegExpFileMapper configure( RegExpFileMapper pMapper, String pPattern, String pReplacement ) { - pMapper.setPattern(pPattern); - pMapper.setReplacement(pReplacement); - return pMapper; + pMapper.setPattern( pPattern ); + pMapper.setReplacement( pReplacement ); + return pMapper; } public void testRegExpFileMapper() throws Exception diff --git a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java index 7d4663b9..1aed4169 100644 --- a/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java @@ -37,10 +37,11 @@ public class FileSelectorTest extends PlexusTestCase protected void testFileSelector( FileSelector pSelector, String[] pInput, boolean[] pOutput) throws IOException { - for ( int i = 0; i < pInput.length; i++ ) + for ( int i = 0; i < pInput.length; i++ ) { final String name = pInput[i]; - AbstractPlexusIoResource resource = new AbstractPlexusIoResource(name, 0, 0, true, false, true){ + AbstractPlexusIoResource resource = new AbstractPlexusIoResource( name, 0, 0, true, false, true ) + { @Nonnull public InputStream getContents() throws IOException { @@ -79,7 +80,7 @@ protected void testFileSelector( AllFilesFileSelector pSelector ) throws Excepti private boolean[] getAllTrues() { final boolean[] trues = new boolean[SAMPLES.length]; - for ( int i = 0; i < trues.length; i++ ) + for ( int i = 0; i < trues.length; i++ ) { trues[i] = true; } @@ -96,7 +97,7 @@ public void testAllFilesFileSelector() throws Exception protected boolean[] getIncludeGifs( String[] pSamples ) { boolean[] result = new boolean[pSamples.length]; - for ( int i = 0; i < pSamples.length; i++ ) + for ( int i = 0; i < pSamples.length; i++ ) { result[i] = pSamples[i].endsWith( ".gif" ); } @@ -105,7 +106,7 @@ protected boolean[] getIncludeGifs( String[] pSamples ) protected boolean[] getExcludeBar( String[] pSamples, boolean[] pResult ) { - for ( int i = 0; i < pSamples.length; i++ ) + for ( int i = 0; i < pSamples.length; i++ ) { if ( pSamples[i].startsWith( "bar/" ) ) { @@ -129,7 +130,8 @@ protected void testFileSelector( IncludeExcludeFileSelector pSelector ) throws E public void testIncludeExcludeFileSelector() throws Exception { testFileSelector( new IncludeExcludeFileSelector() ); - testFileSelector( (IncludeExcludeFileSelector) lookup( FileSelector.ROLE, IncludeExcludeFileSelector.ROLE_HINT ) ); + testFileSelector( (IncludeExcludeFileSelector) lookup( FileSelector.ROLE, + IncludeExcludeFileSelector.ROLE_HINT ) ); } public void testIncludeExcludeFileSelector_SetExcludes() throws Exception @@ -138,9 +140,9 @@ public void testIncludeExcludeFileSelector_SetExcludes() throws Exception // Test that the setExcludes method does not modify the excludes. selector.setExcludes( SAMPLES ); - String [] sltrExcludes = selector.getExcludes(); + String[] sltrExcludes = selector.getExcludes(); assertEquals( SAMPLES.length, sltrExcludes.length ); - for (int i=0; i 0) { - zos.write(buffer, 0, res); + if ( res > 0 ) + { + zos.write( buffer, 0, res ); } } fis.close(); - ze.setTime(f.lastModified()); + ze.setTime( f.lastModified() ); zos.closeEntry(); - } else { - addDirToZipFile(zos, f, entryName); + } + else + { + addDirToZipFile( zos, f, entryName ); } } } @@ -157,7 +168,7 @@ private void testPlexusIoResourceCollection( PlexusIoResourceCollection plexusIo boolean aFileSeen = false; boolean bFileSeen = false; Iterator iter = plexusIoResourceCollection.getResources(); - while ( iter.hasNext() ) + while ( iter.hasNext() ) { PlexusIoResource res = (PlexusIoResource) iter.next(); final String resName = res.getName().replace( File.separatorChar, '/' ); @@ -172,7 +183,7 @@ else if ( Y_PATH.equals( resName ) ) { yPathSeen = true; } - else if ( "".equals( resName ) || ".".equals( resName ) ) + else if ( "".equals( resName ) || ".".equals( resName ) ) { // Ignore me } @@ -207,7 +218,7 @@ else if ( B_PATH.equals( resName ) ) assertTrue( aFileSeen ); assertTrue( bFileSeen ); - if (iter instanceof Closeable) + if ( iter instanceof Closeable ) { ( (Closeable) iter ).close(); } @@ -223,8 +234,10 @@ private void testFileResourceCollection( PlexusIoFileResourceCollection resource public void testFileCollection() throws Exception { createFiles(); - testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.ROLE, PlexusIoResourceCollection.DEFAULT_ROLE_HINT ) ); - testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.ROLE, PlexusIoFileResourceCollection.ROLE_HINT ) ); + testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.ROLE, + PlexusIoResourceCollection.DEFAULT_ROLE_HINT ) ); + testFileResourceCollection( (PlexusIoFileResourceCollection) lookup( PlexusIoResourceCollection.ROLE, + PlexusIoFileResourceCollection.ROLE_HINT ) ); } private void testZipFileCollection( AbstractPlexusIoArchiveResourceCollection resourceCollection, File zipFile ) diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java index 6bcb60e3..f3e46263 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/AbstractPlexusIoResourceCollectionTest.java @@ -17,7 +17,8 @@ public class AbstractPlexusIoResourceCollectionTest extends TestCase { - @SuppressWarnings( "ResultOfMethodCallIgnored" ) public void testGetIncludes() + @SuppressWarnings( "ResultOfMethodCallIgnored" ) + public void testGetIncludes() throws Exception { AbstractPlexusIoResourceCollection sut = new AbstractPlexusIoResourceCollection() @@ -25,7 +26,7 @@ public class AbstractPlexusIoResourceCollectionTest public Iterator getResources() throws IOException { - return Arrays.asList(getResource( "r1" ), getResource( "r2" )).iterator(); + return Arrays.asList( getResource( "r1" ), getResource( "r2" ) ).iterator(); } public Stream stream() @@ -33,9 +34,10 @@ public Stream stream() throw new UnsupportedOperationException(); } - public boolean isConcurrentAccessSupported() { - return true; - } + public boolean isConcurrentAccessSupported() + { + return true; + } }; @@ -56,7 +58,7 @@ public InputStream transform( @Nonnull PlexusIoResource resource, @Nonnull final final InputStream inputStream = sut.getInputStream( next ); inputStream.read(); inputStream.read(); - assertEquals( -1, inputStream.read()); + assertEquals( -1, inputStream.read() ); inputStream.close(); } diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java index ef3c3211..d45762d0 100755 --- a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoFileSupplierResourceCollectionTest.java @@ -14,17 +14,17 @@ public class PlexusIoFileSupplierResourceCollectionTest public void testGetName() throws Exception { - PlexusIoFileResourceCollection - coll = new PlexusIoFileResourceCollection(); - char nonSeparator = File.separatorChar == '/' ?'\\' : '/'; - coll.setPrefix("fud" + nonSeparator ); + PlexusIoFileResourceCollection coll = new PlexusIoFileResourceCollection(); + char nonSeparator = File.separatorChar == '/' ? '\\' : '/'; + coll.setPrefix( "fud" + nonSeparator ); - coll.setBaseDir(new File("src/test/resources/symlinks") ); + coll.setBaseDir( new File( "src/test/resources/symlinks" ) ); final Iterator resources = coll.getResources(); - while (resources.hasNext()){ + while ( resources.hasNext() ) + { final PlexusIoResource next = resources.next(); final String name = coll.getName( next ); - assertTrue( name.indexOf(nonSeparator) < 0); + assertTrue( name.indexOf( nonSeparator ) < 0 ); } } } diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java index 2b3e397f..17905f22 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/PlexusIoPlexusIoFileResourceTest.java @@ -16,13 +16,14 @@ public class PlexusIoPlexusIoFileResourceTest public void testRealSymlink() throws IOException { - if ( Os.isFamily(Os.FAMILY_WINDOWS)) return; + if ( Os.isFamily( Os.FAMILY_WINDOWS ) ) + return; final File file = new File( "src/test/resources/symlinks/src/symDir" ); PlexusIoResourceAttributes attrs = FileAttributes.uncached( file ); - assertTrue(attrs.isSymbolicLink()); - PlexusIoFileResource r = new PlexusIoFileResource( file, "symDir", attrs); - assertTrue(r.isSymbolicLink()); + assertTrue( attrs.isSymbolicLink() ); + PlexusIoFileResource r = new PlexusIoFileResource( file, "symDir", attrs ); + assertTrue( r.isSymbolicLink() ); final File target = SymlinkUtils.readSymbolicLink( file ); - assertTrue(target.getName().endsWith( "targetDir" )); + assertTrue( target.getName().endsWith( "targetDir" ) ); } } \ No newline at end of file diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java index 71d47ca7..a7f4b6d3 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/PlexusIoProxyResourceCollectionTest.java @@ -100,7 +100,7 @@ public URL getURL() public void remove() { - throw new UnsupportedOperationException( ); + throw new UnsupportedOperationException(); } } @@ -122,9 +122,10 @@ public Stream stream() throw new UnsupportedOperationException(); } - public boolean isConcurrentAccessSupported() { - return true; - } + public boolean isConcurrentAccessSupported() + { + return true; + } } ); Iterator resources1 = resCol.getResources(); resources1.hasNext(); diff --git a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java index 03f5bf13..380585fd 100644 --- a/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java +++ b/src/test/java/org/codehaus/plexus/components/io/resources/proxy/ProxyFactoryTest.java @@ -27,8 +27,8 @@ public void testCreateProxy() throws Exception { final PlexusIoResource proxy = ProxyFactory.createProxy( getPomResource(), null ); - assertTrue(proxy instanceof ResourceAttributeSupplier ); - assertTrue(proxy instanceof FileSupplier ); + assertTrue( proxy instanceof ResourceAttributeSupplier ); + assertTrue( proxy instanceof FileSupplier ); assertFalse( proxy instanceof SymlinkDestinationSupplier ); } @@ -58,7 +58,7 @@ public PlexusIoResourceAttributes getAttributes() } }; final PlexusIoResource proxy = ProxyFactory.createProxy( getPomResource(), ns ); - assertSame( s, ( ( ResourceAttributeSupplier)proxy).getAttributes() ); + assertSame( s, ( (ResourceAttributeSupplier) proxy ).getAttributes() ); } public void testCreateProxyWithSizeSupplierOverride() @@ -106,7 +106,7 @@ public String getSymlinkDestination() } }; final PlexusIoResource proxy = ProxyFactory.createProxy( getDummySymlinkResource(), ns ); - assertEquals( "mordor", ((SymlinkDestinationSupplier)proxy).getSymlinkDestination() ); + assertEquals( "mordor", ( (SymlinkDestinationSupplier) proxy ).getSymlinkDestination() ); } @@ -119,7 +119,9 @@ private PlexusIoFileResource getPomResource() return new PlexusIoFileResource( file, "pom.xml", attrs ){}; } - class Dummy extends PlexusIoFileResource implements SymlinkDestinationSupplier { + class Dummy extends PlexusIoFileResource + implements SymlinkDestinationSupplier + { public Dummy( @Nonnull File file, @Nonnull PlexusIoResourceAttributes attrs ) throws IOException {