You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@tapestry.apache.org by dr...@apache.org on 2010/08/10 08:29:55 UTC

svn commit: r983867 - in /tapestry/tapestry5/trunk/tapestry-ioc/src: main/java/org/apache/tapestry5/ioc/internal/AbstractMethodInvokingInstrumenter.java test/java/org/apache/tapestry5/ioc/StaticModule.java

Author: drobiazko
Date: Tue Aug 10 06:29:54 2010
New Revision: 983867

URL: http://svn.apache.org/viewvc?rev=983867&view=rev
Log:
TAP5-1232: Removed auto-injection of service ids as String is backward incompatible with decorators

Modified:
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractMethodInvokingInstrumenter.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractMethodInvokingInstrumenter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractMethodInvokingInstrumenter.java?rev=983867&r1=983866&r2=983867&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractMethodInvokingInstrumenter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractMethodInvokingInstrumenter.java Tue Aug 10 06:29:54 2010
@@ -61,6 +61,7 @@ public class AbstractMethodInvokingInstr
 
         serviceId = resources.getServiceId();
 
+        resourcesDefaults.put(String.class, serviceId);
         resourcesDefaults.put(ObjectLocator.class, resources);
         resourcesDefaults.put(ServiceResources.class, resources);
         logger = resources.getLogger();

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java?rev=983867&r1=983866&r2=983867&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java Tue Aug 10 06:29:54 2010
@@ -54,7 +54,7 @@ public class StaticModule
         };
     }
 
-    public static Runnable decorateBarney(final Object delegate)
+    public static Runnable decorateBarney(final Object delegate, String serviseId)
     {
         return new Runnable()
         {