You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/06/20 11:39:35 UTC
svn commit: r549028 - in /incubator/wicket/trunk: ./ jdk-1.4/
jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/injection/
jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/proxy/
jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/
Author: almaw
Date: Wed Jun 20 02:39:34 2007
New Revision: 549028
URL: http://svn.apache.org/viewvc?view=rev&rev=549028
Log:
wicket-ioc
Removed:
incubator/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/injection/
incubator/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/proxy/
Modified:
incubator/wicket/trunk/jdk-1.4/pom.xml
incubator/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
incubator/wicket/trunk/pom.xml
Modified: incubator/wicket/trunk/jdk-1.4/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/pom.xml?view=diff&rev=549028&r1=549027&r2=549028
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/pom.xml (original)
+++ incubator/wicket/trunk/jdk-1.4/pom.xml Wed Jun 20 02:39:34 2007
@@ -43,6 +43,7 @@
<modules>
<module>wicket</module>
<module>wicket-extensions</module>
+ <module>wicket-ioc</module>
<module>wicket-spring</module>
<module>wicket-quickstart</module>
<module>wicket-datetime</module>
Modified: incubator/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?view=diff&rev=549028&r1=549027&r2=549028
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java Wed Jun 20 02:39:34 2007
@@ -19,6 +19,7 @@
import java.lang.ref.WeakReference;
import org.apache.wicket.proxy.IProxyTargetLocator;
+import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Objects;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -139,22 +140,13 @@
Class clazz = beanTypeCache == null ? null : (Class)beanTypeCache.get();
if (clazz == null)
{
- try
- {
- /*
- * Need to make this scoped, rather than sticking it straight into the WeakReference,
- * otherwise it might get garbage collected before we've even returned it!
- */
- clazz = Class.forName(beanTypeName, true, Thread.currentThread()
- .getContextClassLoader());
- beanTypeCache = new WeakReference(clazz);
- }
- catch (ClassNotFoundException e)
+ beanTypeCache = new WeakReference(clazz = Classes.resolveClass(beanTypeName));
+ if (clazz == null)
{
throw new RuntimeException("SpringBeanLocator could not find class ["
+ beanTypeName + "] needed to locate the ["
+ ((beanName != null) ? (beanName) : ("bean name not specified"))
- + "] bean", e);
+ + "] bean");
}
}
return clazz;
Modified: incubator/wicket/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/pom.xml?view=diff&rev=549028&r1=549027&r2=549028
==============================================================================
--- incubator/wicket/trunk/pom.xml (original)
+++ incubator/wicket/trunk/pom.xml Wed Jun 20 02:39:34 2007
@@ -220,6 +220,18 @@
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-guice</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-ioc</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
<artifactId>wicket-jmx</artifactId>
<version>${project.version}</version>
<type>jar</type>
@@ -369,6 +381,11 @@
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>1.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>easymock</groupId>