From dec0263088bcc94e78ae1b6ce0634445772bba99 Mon Sep 17 00:00:00 2001 From: Mingjiang Shi Date: Wed, 6 May 2015 17:16:29 +0800 Subject: [PATCH] support customize descriptor for jar and war --- .../alibaba/antx/config/entry/ConfigEntryFactoryImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/antx/autoconfig/src/main/java/com/alibaba/antx/config/entry/ConfigEntryFactoryImpl.java b/antx/autoconfig/src/main/java/com/alibaba/antx/config/entry/ConfigEntryFactoryImpl.java index 7129d6d..6febcc0 100644 --- a/antx/autoconfig/src/main/java/com/alibaba/antx/config/entry/ConfigEntryFactoryImpl.java +++ b/antx/autoconfig/src/main/java/com/alibaba/antx/config/entry/ConfigEntryFactoryImpl.java @@ -139,9 +139,9 @@ protected void populateDescriptorContext(Map context, String name) { }; } - entry.setDescriptorPatterns(new PatternSet("META-INF/**/auto-config.xml")); + entry.setDescriptorPatterns(new PatternSet(settings.getDescriptorPatterns(), new PatternSet("META-INF/**/auto-config.xml")).addDefaultExcludes()); - entry.setPackagePatterns(new PatternSet("WEB-INF/lib/*.jar")); + entry.setPackagePatterns(new PatternSet(settings.getPackagePatterns(), new PatternSet("WEB-INF/lib/*.jar")).addDefaultExcludes()); return entry; } @@ -167,9 +167,9 @@ protected void populateDescriptorContext(Map context, String name) { }; } - entry.setDescriptorPatterns(new PatternSet("META-INF/**/auto-config.xml")); + entry.setDescriptorPatterns(new PatternSet(settings.getDescriptorPatterns(), new PatternSet("META-INF/**/auto-config.xml")).addDefaultExcludes()); - entry.setPackagePatterns(new PatternSet("**/*.jar, **/*.war, **/*.rar, **/*.ear")); + entry.setPackagePatterns(new PatternSet(settings.getPackagePatterns(), new PatternSet("**/*.jar, **/*.war, **/*.rar, **/*.ear")).addDefaultExcludes()); return entry; }