You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/12/11 06:28:55 UTC
svn commit: r603146 -
/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
Author: ivaynberg
Date: Mon Dec 10 21:28:52 2007
New Revision: 603146
URL: http://svn.apache.org/viewvc?rev=603146&view=rev
Log:
WCKET-1189 SpringWebApplicationFactory cannot load WA from parent bean factory
Modified:
wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
Modified: wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=603146&r1=603145&r2=603146&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java (original)
+++ wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java Mon Dec 10 21:28:52 2007
@@ -23,6 +23,7 @@
import org.apache.wicket.protocol.http.IWebApplicationFactory;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WicketFilter;
+import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -99,7 +100,8 @@
}
else
{
- Map beans = ac.getBeansOfType(WebApplication.class, false, false);
+ Map beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(ac, WebApplication.class,
+ false, false);
if (beans.size() == 0)
{
throw new IllegalStateException("bean of type [" + WebApplication.class.getName() +