Bugfix - Input/exclude paths treated as absolute instead of relative

Author: tylercamp

pom.xml

@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.codedx</groupId>
     <artifactId>codedx-bamboo-plugin</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
 
     <organization>
         <name>Code Dx</name>

src/main/java/com/codedx/plugins/bamboo/utils/Archiver.java

@@ -23,7 +23,7 @@ public static File archive(File workspace, String paths, String excludePaths, St
 
 		_logger.info(String.format("archive(...) called.  paths: %s || excludePaths: %s || prefix: %s", emptyIfNull(paths), emptyIfNull(excludePaths), emptyIfNull(prefix)));
 
-		List<File> files = getFiles(workspace, paths, excludePaths);
+		List<File> files = getFiles(workspace, workspace, paths, excludePaths);
 
 		Path workspaceDir = Paths.get(workspace.getCanonicalPath());
 		Path tempFile = Files.createTempFile(prefix, ".zip");
@@ -69,20 +69,20 @@ private static String[] splitFileWildcards(final String string) {
 		return new String[0];
 	}
 
-	private static List<File> getFiles(File workspace, String paths, String excludePaths) throws IOException {
+	private static List<File> getFiles(File rootPath, File directory, String paths, String excludePaths) throws IOException {
 		AntPathMatcher matcher = new AntPathMatcher();
 
 		List<File> collectedFiles = new ArrayList<>();
-		File[] files = workspace.listFiles();
+		File[] files = directory.listFiles();
 		for (File file : files)
 		{
-			if (matches(matcher, paths, excludePaths, file.getCanonicalPath())) {
+			if (matches(matcher, paths, excludePaths, file.getCanonicalPath().substring(rootPath.getCanonicalPath().length()))) {
 				collectedFiles.add(file);
 
 				// recursively add subdirectories
 				if(file.isDirectory())
 				{
-					collectedFiles.addAll(getFiles(file, paths, excludePaths));
+					collectedFiles.addAll(getFiles(rootPath, file, paths, excludePaths));
 				}
 			}
 		}