TENTACLES-7 Scan archives in EAR and RAR files.
- Applied modified patch from Jonathan Gallimore from Jira.
git-svn-id: https://svn.apache.org/repos/asf/creadur/tentacles/trunk@1620516 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.gitignore b/.gitignore
index 69b2032..b2c01ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
*/*.iws
.idea/*
*/.idea
+/target/
diff --git a/src/main/java/org/apache/creadur/tentacles/Main.java b/src/main/java/org/apache/creadur/tentacles/Main.java
index 42809c2..a9aa7f3 100644
--- a/src/main/java/org/apache/creadur/tentacles/Main.java
+++ b/src/main/java/org/apache/creadur/tentacles/Main.java
@@ -54,6 +54,7 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger
.getLogger(Main.class);
+ private static final String CRAWL_PATTERN = ".*\\.(jar|zip|war|ear|rar|tar.gz)";
private final Reports reports;
private final Licenses licenses;
@@ -323,7 +324,7 @@
client.crawl(configuration.getStagingRepositoryURI());
for (final URI uri : resources) {
- if (!uri.getPath().matches(".*(war|jar|zip)")) {
+ if (!uri.getPath().matches(CRAWL_PATTERN)) {
continue;
}
files.add(client.download(uri, mirroredFrom(uri)));
diff --git a/src/main/java/org/apache/creadur/tentacles/filter/IsArchiveInPathFilter.java b/src/main/java/org/apache/creadur/tentacles/filter/IsArchiveInPathFilter.java
index 8d30f2b..2dba898 100644
--- a/src/main/java/org/apache/creadur/tentacles/filter/IsArchiveInPathFilter.java
+++ b/src/main/java/org/apache/creadur/tentacles/filter/IsArchiveInPathFilter.java
@@ -23,6 +23,7 @@
final class IsArchiveInPathFilter implements FileFilter {
+ private static final String MATCH_PATTERN = ".*\\.(jar|zip|war|ear|rar|tar.gz)";
private final String pathNameFilter;
IsArchiveInPathFilter(final String pathNameFilter) {
@@ -37,6 +38,6 @@
}
private boolean isValidArchive(final String path) {
- return path.matches(".*\\.(jar|zip|war|ear|tar.gz)");
+ return path.matches(MATCH_PATTERN);
}
-}
\ No newline at end of file
+}
