Browse Source

Merge pull request #219 in CORE/base-third from ~ANDREW.ASA/base-third:feature/10.0 to feature/10.0

* commit '90356b0b638a030df3dd761236bd6589bb9110bf':
  换个名,防止
  KERNEL-550 Spring配置跟客户冲突问题, third包中META-INF/spring.schemas会跟客户的冲突, 需要修改下我们的配置.
research/11.0
andrew.asa 6 years ago
parent
commit
a8807e313a
  1. 0
      fine-spring/resources/META-INF/fine-spring.handlers
  2. 0
      fine-spring/resources/META-INF/fine-spring.schemas
  3. 0
      fine-spring/resources/META-INF/fine-spring.tooling
  4. 2
      fine-spring/src/com/fr/third/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
  5. 2
      fine-spring/src/com/fr/third/springframework/beans/factory/xml/PluggableSchemaResolver.java

0
fine-spring/resources/META-INF/spring.handlers → fine-spring/resources/META-INF/fine-spring.handlers

0
fine-spring/resources/META-INF/spring.schemas → fine-spring/resources/META-INF/fine-spring.schemas

0
fine-spring/resources/META-INF/spring.tooling → fine-spring/resources/META-INF/fine-spring.tooling

2
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. * 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 */ /** Logger available to subclasses */

2
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. * The location of the file that defines schema mappings.
* Can be present in multiple JAR files. * 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); private static final Log logger = LogFactory.getLog(PluggableSchemaResolver.class);

Loading…
Cancel
Save