Browse Source

Made WebApplicationContextUtils:registerWebApplicationScopes public. Changed core's org.springframework.asm OSGi import to proper version numbers

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@826 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Ben Hale 17 years ago
parent
commit
e3a4b4faae
  1. 2
      org.springframework.core/template.mf
  2. 2
      org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java

2
org.springframework.core/template.mf

@ -8,7 +8,7 @@ Import-Template: @@ -8,7 +8,7 @@ Import-Template:
edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional,
org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional,
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
org.springframework.asm.*;version="[2.5.6, 3.0.0]";resolution:=optional,
org.springframework.asm.*;version="[3.0.0, 3.0.1)";resolution:=optional,
org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional,
org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional
Unversioned-Imports:

2
org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java

@ -119,7 +119,7 @@ public abstract class WebApplicationContextUtils { @@ -119,7 +119,7 @@ public abstract class WebApplicationContextUtils {
* as used by the WebApplicationContext.
* @param beanFactory the BeanFactory to configure
*/
static void registerWebApplicationScopes(ConfigurableListableBeanFactory beanFactory) {
public static void registerWebApplicationScopes(ConfigurableListableBeanFactory beanFactory) {
beanFactory.registerScope(WebApplicationContext.SCOPE_REQUEST, new RequestScope());
beanFactory.registerScope(WebApplicationContext.SCOPE_SESSION, new SessionScope(false));
beanFactory.registerScope(WebApplicationContext.SCOPE_GLOBAL_SESSION, new SessionScope(true));

Loading…
Cancel
Save