From f163e84d11c8bf503c3ef0efd8e3939f89bafec2 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 10 Jan 2013 19:14:56 +0400 Subject: [PATCH] IDEA-97815 If Maven project has two resources-folders, neither is copied. --- .../maven/model/impl/MavenProjectConfiguration.java | 1 - .../model/impl/MavenResourceRootDescriptor.java | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java index adcb12586a0d..adbc48ee7ce7 100644 --- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java +++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java @@ -37,7 +37,6 @@ import java.util.regex.Pattern; public class MavenProjectConfiguration { public static final String CONFIGURATION_FILE_RELATIVE_PATH = "maven/configuration.xml"; public static final String DEFAULT_ESCAPE_STRING = "\\"; - public static final String[] DEFAULT_INCLUDES = {"**/*"}; private static final Pattern PROPERTY_PATTERN = Pattern.compile("-D(\\S+?)=(.+)"); public static final Set DEFAULT_FILTERING_EXCLUDED_EXTENSIONS; static { diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java index 8560fd8e5c11..a9bf5d6e764b 100644 --- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java +++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java @@ -78,10 +78,15 @@ public class MavenResourceRootDescriptor extends BuildRootDescriptor { public boolean isIncluded(String relativePath) { if (myNormalizedIncludes == null) { - myNormalizedIncludes = normalizePatterns(myConfig.includes, MavenProjectConfiguration.DEFAULT_INCLUDES); + if (myConfig.includes.isEmpty()) { + myNormalizedIncludes = new String[]{"**" + File.separatorChar + '*'}; + } + else { + myNormalizedIncludes = normalizePatterns(myConfig.includes); + } } if (myNormalizedExcludes == null) { - myNormalizedExcludes = normalizePatterns(myConfig.excludes, ArrayUtil.EMPTY_STRING_ARRAY); + myNormalizedExcludes = normalizePatterns(myConfig.excludes); } return isIncluded(FileUtil.toSystemIndependentName(relativePath), myNormalizedIncludes, myNormalizedExcludes); } @@ -106,9 +111,7 @@ public class MavenResourceRootDescriptor extends BuildRootDescriptor { } @NotNull - private static String[] normalizePatterns(@NotNull Collection patterns, @NotNull String[] defaultValue) { - if (patterns.size() == 0) return defaultValue; - + private static String[] normalizePatterns(@NotNull Collection patterns) { String[] res = new String[patterns.size()]; int i = 0;