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 2011/01/23 07:37:44 UTC
svn commit: r1062332 - in /wicket/branches/wicket-1.4.x:
wicket-guice/src/main/java/org/apache/wicket/guice/
wicket-ioc/src/main/java/org/apache/wicket/injection/web/
wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/
Author: ivaynberg
Date: Sun Jan 23 06:37:43 2011
New Revision: 1062332
URL: http://svn.apache.org/viewvc?rev=1062332&view=rev
Log:
Issue: WICKET-3358
Modified:
wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
Modified: wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java?rev=1062332&r1=1062331&r2=1062332&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceComponentInjector.java Sun Jan 23 06:37:43 2011
@@ -99,7 +99,7 @@ public class GuiceComponentInjector exte
public GuiceComponentInjector(Application app, Injector injector)
{
app.setMetaData(GuiceInjectorHolder.INJECTOR_KEY, new GuiceInjectorHolder(injector));
- InjectorHolder.setInjector(this);
+ InjectorHolder.setInjector(this, app);
}
/**
@@ -248,5 +248,5 @@ public class GuiceComponentInjector exte
{
// No need of {@link IFieldValueFactory}
return null;
-}
+ }
}
Modified: wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java?rev=1062332&r1=1062331&r2=1062332&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-ioc/src/main/java/org/apache/wicket/injection/web/InjectorHolder.java Sun Jan 23 06:37:43 2011
@@ -40,8 +40,8 @@ import org.apache.wicket.injection.Confi
*
* InjectorHolder.setInjector(new MockSpringInjector());
*
- * //from this point on InjectableWebPage and InjectablePanel
- * //will be injected using the MockSpringInjector
+ * // from this point on InjectableWebPage and InjectablePanel
+ * // will be injected using the MockSpringInjector
* </pre>
*
* @author Igor Vaynberg (ivaynberg)
@@ -86,7 +86,23 @@ public class InjectorHolder
public static void setInjector(ConfigurableInjector newInjector)
{
Application application = Application.get();
+ setInjector(newInjector, application);
+ }
+
+ /**
+ * Sets an injector
+ *
+ * NOTICE this method is not thread safe.
+ *
+ * @param newInjector
+ * new injector
+ * @param application
+ * application instance to which the injector will be bound
+ */
+ public static void setInjector(ConfigurableInjector newInjector, Application application)
+ {
application.setMetaData(INJECTOR_KEY, newInjector);
}
+
}
Modified: wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java?rev=1062332&r1=1062331&r2=1062332&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java Sun Jan 23 06:37:43 2011
@@ -101,7 +101,8 @@ public class SpringComponentInjector ext
webapp.setMetaData(CONTEXT_KEY, new ApplicationContextHolder(ctx));
// ... and create and register the annotation aware injector
- InjectorHolder.setInjector(new AnnotSpringInjector(new ContextLocator(), wrapInProxies));
+ InjectorHolder.setInjector(new AnnotSpringInjector(new ContextLocator(), wrapInProxies),
+ webapp);
}
/**