From aa5cb32b23d65de66254473dccdf0ac4546d78ca Mon Sep 17 00:00:00 2001 From: "andrew.asa" Date: Fri, 10 May 2019 10:25:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-550=20Spring=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=B7=9F=E5=AE=A2=E6=88=B7=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= =?UTF-8?q?,=20third=E5=8C=85=E4=B8=ADMETA-INF/spring.schemas=E4=BC=9A?= =?UTF-8?q?=E8=B7=9F=E5=AE=A2=E6=88=B7=E7=9A=84=E5=86=B2=E7=AA=81,=20?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=88=91=E4=BB=AC?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../META-INF/{spring.handlers => fine-spring.handlers} | 0 .../resources/META-INF/{spring.schemas => fine-spring.schemas} | 0 .../beans/factory/xml/DefaultNamespaceHandlerResolver.java | 2 +- .../beans/factory/xml/PluggableSchemaResolver.java | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename fine-spring/resources/META-INF/{spring.handlers => fine-spring.handlers} (100%) rename fine-spring/resources/META-INF/{spring.schemas => fine-spring.schemas} (100%) diff --git a/fine-spring/resources/META-INF/spring.handlers b/fine-spring/resources/META-INF/fine-spring.handlers similarity index 100% rename from fine-spring/resources/META-INF/spring.handlers rename to fine-spring/resources/META-INF/fine-spring.handlers diff --git a/fine-spring/resources/META-INF/spring.schemas b/fine-spring/resources/META-INF/fine-spring.schemas similarity index 100% rename from fine-spring/resources/META-INF/spring.schemas rename to fine-spring/resources/META-INF/fine-spring.schemas diff --git a/fine-spring/src/com/fr/third/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java b/fine-spring/src/com/fr/third/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java index 5f4592639..cef29f883 100644 --- a/fine-spring/src/com/fr/third/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java +++ b/fine-spring/src/com/fr/third/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java @@ -51,7 +51,7 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver /** * The location to look for the mapping files. Can be present in multiple JAR files. */ - public static final String DEFAULT_HANDLER_MAPPINGS_LOCATION = "META-INF/spring.handlers"; + public static final String DEFAULT_HANDLER_MAPPINGS_LOCATION = "META-INF/fine-spring.handlers"; /** Logger available to subclasses */ diff --git a/fine-spring/src/com/fr/third/springframework/beans/factory/xml/PluggableSchemaResolver.java b/fine-spring/src/com/fr/third/springframework/beans/factory/xml/PluggableSchemaResolver.java index 9c77bf224..2303acb2e 100644 --- a/fine-spring/src/com/fr/third/springframework/beans/factory/xml/PluggableSchemaResolver.java +++ b/fine-spring/src/com/fr/third/springframework/beans/factory/xml/PluggableSchemaResolver.java @@ -60,7 +60,7 @@ public class PluggableSchemaResolver implements EntityResolver { * The location of the file that defines schema mappings. * Can be present in multiple JAR files. */ - public static final String DEFAULT_SCHEMA_MAPPINGS_LOCATION = "META-INF/spring.schemas"; + public static final String DEFAULT_SCHEMA_MAPPINGS_LOCATION = "META-INF/fine-spring.schemas"; private static final Log logger = LogFactory.getLog(PluggableSchemaResolver.class); From 90356b0b638a030df3dd761236bd6589bb9110bf Mon Sep 17 00:00:00 2001 From: "andrew.asa" Date: Fri, 10 May 2019 10:31:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8D=A2=E4=B8=AA=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/META-INF/{spring.tooling => fine-spring.tooling} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename fine-spring/resources/META-INF/{spring.tooling => fine-spring.tooling} (100%) diff --git a/fine-spring/resources/META-INF/spring.tooling b/fine-spring/resources/META-INF/fine-spring.tooling similarity index 100% rename from fine-spring/resources/META-INF/spring.tooling rename to fine-spring/resources/META-INF/fine-spring.tooling