You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/03/01 07:23:36 UTC

svn commit: r513172 - in /incubator/wicket: branches/wicket-1.x/wicket-spring/src/main/java/wicket/proxy/ branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/ branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/ trunk/wicket-spring/s...

Author: ehillenius
Date: Wed Feb 28 22:23:35 2007
New Revision: 513172

URL: http://svn.apache.org/viewvc?view=rev&rev=513172
Log:
WICKET-337

Modified:
    incubator/wicket/branches/wicket-1.x/wicket-spring/src/main/java/wicket/proxy/LazyInitProxyFactory.java
    incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java
    incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/Bean.java
    incubator/wicket/trunk/wicket-spring/src/main/java/wicket/spring/injection/SpringComponentInjector.java
    incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean.java
    incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean2.java
    incubator/wicket/trunk/wicket-spring/src/test/java/wicket/util/license/ApacheLicenseHeaderTest.java

Modified: incubator/wicket/branches/wicket-1.x/wicket-spring/src/main/java/wicket/proxy/LazyInitProxyFactory.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring/src/main/java/wicket/proxy/LazyInitProxyFactory.java?view=diff&rev=513172&r1=513171&r2=513172
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-spring/src/main/java/wicket/proxy/LazyInitProxyFactory.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-spring/src/main/java/wicket/proxy/LazyInitProxyFactory.java Wed Feb 28 22:23:35 2007
@@ -24,11 +24,11 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import wicket.model.IModel;
-
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
+import wicket.IClusterable;
+import wicket.model.IModel;
 
 /**
  * A factory class that creates lazy init proxies given a type and a
@@ -170,7 +170,7 @@
 	 * @author Igor Vaynberg (ivaynberg)
 	 * 
 	 */
-	static class ProxyReplacement implements Serializable
+	static class ProxyReplacement implements IClusterable
 	{
 		private IProxyTargetLocator locator;
 

Modified: incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java?view=diff&rev=513172&r1=513171&r2=513172
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java Wed Feb 28 22:23:35 2007
@@ -19,7 +19,6 @@
 import java.lang.reflect.Proxy;
 
 import junit.framework.TestCase;
-
 import wicket.proxy.LazyInitProxyFactory.ProxyReplacement;
 import wicket.proxy.util.ConcreteObject;
 import wicket.proxy.util.IInterface;
@@ -27,7 +26,6 @@
 import wicket.proxy.util.InterfaceObject;
 import wicket.proxy.util.ObjectMethodTester;
 import wicket.util.lang.Objects;
-import wicket.util.tester.WicketTester;
 
 /**
  * Tests lazy init proxy factory

Modified: incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/Bean.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/Bean.java?view=diff&rev=513172&r1=513171&r2=513172
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/Bean.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/Bean.java Wed Feb 28 22:23:35 2007
@@ -16,14 +16,14 @@
  */
 package wicket.spring;
 
-import java.io.Serializable;
+import wicket.IClusterable;
 
 /**
  * Mock spring bean
  * 
  * @author Igor Vaynberg (ivaynberg)
  */
-public class Bean implements Serializable
+public class Bean implements IClusterable
 {
 
 }

Modified: incubator/wicket/trunk/wicket-spring/src/main/java/wicket/spring/injection/SpringComponentInjector.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-spring/src/main/java/wicket/spring/injection/SpringComponentInjector.java?view=diff&rev=513172&r1=513171&r2=513172
==============================================================================
--- incubator/wicket/trunk/wicket-spring/src/main/java/wicket/spring/injection/SpringComponentInjector.java (original)
+++ incubator/wicket/trunk/wicket-spring/src/main/java/wicket/spring/injection/SpringComponentInjector.java Wed Feb 28 22:23:35 2007
@@ -17,7 +17,6 @@
 package wicket.spring.injection;
 
 import java.io.FileNotFoundException;
-import java.io.Serializable;
 
 import javax.servlet.ServletContext;
 
@@ -30,6 +29,7 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 import wicket.Application;
+import wicket.IClusterable;
 import wicket.MetaDataKey;
 import wicket.Session;
 import wicket.application.IComponentInstantiationListener;
@@ -148,7 +148,7 @@
 	 * This is a holder for the application context. The reason we need a holder
 	 * is that metadata only supports storing serializable objects but
 	 * application context is not. The holder acts as a serializable wrapper for
-	 * the context. Notice that although holder implements serializable it
+	 * the context. Notice that although holder implements IClusterable it
 	 * really is not because it has a reference to non serializable context -
 	 * but this is ok because metadata objects in application are never
 	 * serialized.
@@ -156,7 +156,7 @@
 	 * @author ivaynberg
 	 * 
 	 */
-	private static class ApplicationContextHolder implements Serializable
+	private static class ApplicationContextHolder implements IClusterable
 	{
 		private static final long serialVersionUID = 1L;
 

Modified: incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean.java?view=diff&rev=513172&r1=513171&r2=513172
==============================================================================
--- incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean.java (original)
+++ incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean.java Wed Feb 28 22:23:35 2007
@@ -16,14 +16,14 @@
  */
 package wicket.spring;
 
-import java.io.Serializable;
+import wicket.IClusterable;
 
 /**
  * Mock spring bean
  * 
  * @author Igor Vaynberg (ivaynberg)
  */
-public class Bean implements Serializable
+public class Bean implements IClusterable
 {
 
 }

Modified: incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean2.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean2.java?view=diff&rev=513172&r1=513171&r2=513172
==============================================================================
--- incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean2.java (original)
+++ incubator/wicket/trunk/wicket-spring/src/test/java/wicket/spring/Bean2.java Wed Feb 28 22:23:35 2007
@@ -16,14 +16,14 @@
  */
 package wicket.spring;
 
-import java.io.Serializable;
+import wicket.IClusterable;
 
 /**
  * Mock spring bean
  * 
  * @author Igor Vaynberg (ivaynberg)
  */
-public class Bean2 implements Serializable
+public class Bean2 implements IClusterable
 {
 
 }

Modified: incubator/wicket/trunk/wicket-spring/src/test/java/wicket/util/license/ApacheLicenseHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-spring/src/test/java/wicket/util/license/ApacheLicenseHeaderTest.java?view=diff&rev=513172&r1=513171&r2=513172
==============================================================================
--- incubator/wicket/trunk/wicket-spring/src/test/java/wicket/util/license/ApacheLicenseHeaderTest.java (original)
+++ incubator/wicket/trunk/wicket-spring/src/test/java/wicket/util/license/ApacheLicenseHeaderTest.java Wed Feb 28 22:23:35 2007
@@ -16,7 +16,6 @@
  */
 package wicket.util.license;
 
-import wicket.util.license.ApacheLicenseHeaderTestCase;
 
 /**
  * Test that the license headers are in place in this project. The tests are run