Skip to content

Commit e3e8f56

Browse files
mitonizemitonize
committed
ビルトインの ServiceProviderファイルについて既存の定義をWebInfSourceScannerで代替
1 parent 23dac5e commit e3e8f56

File tree

3 files changed

+16
-49
lines changed

3 files changed

+16
-49
lines changed

‎src-impl/org/seasar/mayaa/impl/provider/factory/org.seasar.mayaa.provider.ServiceProvider

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,14 @@
5454
<libraryManager class="org.seasar.mayaa.impl.builder.library.LibraryManagerImpl">
5555
<converter name="ProcessorProperty" class="org.seasar.mayaa.impl.builder.library.converter.ProcessorPropertyConverter"/>
5656
<converter name="PrefixAwareName" class="org.seasar.mayaa.impl.builder.library.converter.PrefixAwareNameConverter"/>
57-
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.FolderSourceScanner">
58-
<parameter name="folder" value="/WEB-INF"/>
59-
<parameter name="recursive" value="true"/>
60-
<parameter name="extension" value=".tld"/>
61-
<parameter name="extension" value=".mld"/>
62-
</scanner>
63-
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.MetaInfSourceScanner">
64-
<parameter name="folder" value="/WEB-INF/lib"/>
65-
<parameter name="extension" value=".jar"/>
66-
<parameter name="ignore" value="commons-beanutils-"/>
67-
<parameter name="ignore" value="commons-collections-"/>
68-
<parameter name="ignore" value="commons-logging-"/>
69-
<parameter name="ignore" value="nekohtml-"/>
70-
<parameter name="ignore" value="jaxen-"/>
71-
<parameter name="ignore" value="xml-apis-"/>
72-
<parameter name="ignore" value="xercesImpl-"/>
73-
<parameter name="ignore" value="rhino-"/>
74-
<parameter name="jar.ignore" value="META-INF/MANIFEST.MF"/>
75-
<parameter name="jar.extension" value=".mld"/>
76-
<parameter name="jar.extension" value=".tld"/>
57+
58+
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.WebInfSourceScanner">
59+
<!-- <parameter name="include" value="**/*.{tld,mld}"/> -->
60+
<parameter name="excludeJar" value="commons-beanutils,commons-collections,commons-logging,nekohtml,jaxen,xml-apis,xercesImpl,rhino}-*.jar"/>
61+
<parameter name="includeJar" value="*.jar"/>
62+
<!-- <parameter name="includeInJarMetaInf" value="*.tld"/> -->
7763
</scanner>
64+
7865
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.ResourceScanner">
7966
<parameter name="root" value="META-INF/"/>
8067
<parameter name="ignore" value="META-INF/MANIFEST.MF"/>
@@ -85,7 +72,7 @@
8572
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.DefaultSourceScanner"/>
8673

8774
<!-- after scan jars -->
88-
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.WebXMLTaglibSourceScanner"/>
75+
<!-- <scanner class="org.seasar.mayaa.impl.builder.library.scanner.WebXMLTaglibSourceScanner"/> -->
8976

9077
<builder class="org.seasar.mayaa.impl.builder.library.MLDDefinitionBuilder"/>
9178
<builder class="org.seasar.mayaa.impl.builder.library.TLDDefinitionBuilder"/>

‎test-war/src/main/resources/jboss-logging.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
loggers=org.seasar.mayaa,org.seasar.mayaa.impl.builder.library
33
# Root logger configuration
44
logger.level=INFO
5-
logger.org.seasar.mayaa.level=FINE
6-
logger.org.seasar.mayaa.impl.builder.library.level=INFO
5+
logger.org.seasar.mayaa.level=INFO
6+
logger.org.seasar.mayaa.impl.builder.library.level=FINE
77

88

99
# HANDLERS

‎test-war/src/main/webapp/WEB-INF/org.seasar.mayaa.provider.ServiceProvider

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -55,40 +55,20 @@
5555
<converter name="ProcessorProperty" class="org.seasar.mayaa.impl.builder.library.converter.ProcessorPropertyConverter"/>
5656
<converter name="PrefixAwareName" class="org.seasar.mayaa.impl.builder.library.converter.PrefixAwareNameConverter"/>
5757

58-
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.FolderSourceScanner">
59-
<parameter name="folder" value="/WEB-INF"/>
60-
<parameter name="recursive" value="true"/>
61-
<parameter name="extension" value=".tld"/>
62-
<parameter name="extension" value=".mld"/>
63-
</scanner>
64-
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.MetaInfSourceScanner">
65-
<parameter name="folder" value="/WEB-INF/lib"/>
66-
<parameter name="extension" value=".jar"/>
67-
<parameter name="ignore" value="commons-beanutils-"/>
68-
<parameter name="ignore" value="commons-collections-"/>
69-
<parameter name="ignore" value="commons-logging-"/>
70-
<parameter name="ignore" value="nekohtml-"/>
71-
<parameter name="ignore" value="jaxen-"/>
72-
<parameter name="ignore" value="xml-apis-"/>
73-
<parameter name="ignore" value="xercesImpl-"/>
74-
<parameter name="ignore" value="rhino-"/>
75-
<parameter name="jar.ignore" value="META-INF/MANIFEST.MF"/>
76-
<parameter name="jar.ignore" value="META-INF/scriptfree"/>
77-
<parameter name="jar.extension" value=".mld"/>
78-
<parameter name="jar.extension" value=".tld"/>
58+
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.WebInfSourceScanner">
59+
<!-- <parameter name="include" value="**/*.{tld,mld}"/> -->
60+
<parameter name="excludeJar" value="commons-beanutils,commons-collections,commons-logging,nekohtml,jaxen,xml-apis,xercesImpl,rhino}-*.jar"/>
61+
<parameter name="includeJar" value="*.jar"/>
62+
<!-- <parameter name="includeInJarMetaInf" value="*.tld"/> -->
7963
</scanner>
64+
8065
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.ResourceScanner">
8166
<parameter name="root" value="META-INF/"/>
8267
<parameter name="ignore" value="META-INF/MANIFEST.MF"/>
8368
<parameter name="extension" value=".mld"/>
8469
<parameter name="extension" value=".tld"/>
85-
<parameter name="includeJar" value="taglibs-standard-impl-*.jar"/>
86-
<parameter name="excludeJar" value="*"/>
8770
</scanner>
8871

89-
<!-- after scan jars -->
90-
<!-- <scanner class="org.seasar.mayaa.impl.builder.library.scanner.WebXMLTaglibSourceScanner"/> -->
91-
9272
<scanner class="org.seasar.mayaa.impl.builder.library.scanner.DefaultSourceScanner"/>
9373
<builder class="org.seasar.mayaa.impl.builder.library.MLDDefinitionBuilder"/>
9474
<builder class="org.seasar.mayaa.impl.builder.library.TLDDefinitionBuilder"/>

0 commit comments

Comments
 (0)