From 656b23992516b8b3faba9e88022df248308dac40 Mon Sep 17 00:00:00 2001 From: Richard Vowles Date: Sun, 16 Mar 2014 13:11:51 +1300 Subject: [PATCH] assume that if includes are specified then turn default includes off --- .../server/core/BootupClassPathSearch.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/BootupClassPathSearch.java b/src/main/java/com/avaje/ebeaninternal/server/core/BootupClassPathSearch.java index d002aa695..014fa0d3b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/BootupClassPathSearch.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/BootupClassPathSearch.java @@ -82,16 +82,22 @@ public class BootupClassPathSearch { ClassPathSearchFilter filter = new ClassPathSearchFilter(); filter.addDefaultExcludePackages(); - if (packages != null) { + if (packages != null && packages.size() > 0) { for (String packageName : packages) { filter.includePackage(packageName); } + + // if they specified include packages, they don't want by default to include everything + filter.setDefaultPackageMatch(false); } - if (jars != null) { + if (jars != null && jars.size() > 0) { for (String jarName : jars) { filter.includeJar(jarName); } + + // if they specified jars to specifically include, they don't want everything included + filter.setDefaultJarMatch(false); } return filter;