svn commit: r518663 - /tapestry/tapestry5/quickstart/trunk/src/main/resources/archetype-resources/src/main/java/services/AppModule.java

[hl...@apache.org]

Author: hlship
Date: Thu Mar 15 08:29:39 2007
New Revision: 518663

URL: http://svn.apache.org/viewvc?view=rev&rev=518663
Log:
TAPESTRY-1357: Quickstart archetype still uses out-of-date @Id and @Contribute annotations

Modified:
    tapestry/tapestry5/quickstart/trunk/src/main/resources/archetype-resources/src/main/java/services/AppModule.java

Modified: tapestry/tapestry5/quickstart/trunk/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/quickstart/trunk/src/main/resources/archetype-resources/src/main/java/services/AppModule.java?view=diff&rev=518663&r1=518662&r2=518663
==============================================================================
--- tapestry/tapestry5/quickstart/trunk/src/main/resources/archetype-resources/src/main/java/services/AppModule.java (original)
+++ tapestry/tapestry5/quickstart/trunk/src/main/resources/archetype-resources/src/main/java/services/AppModule.java Thu Mar 15 08:29:39 2007
@@ -5,8 +5,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.tapestry.ioc.MappedConfiguration;
 import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.annotations.Contribute;
-import org.apache.tapestry.ioc.annotations.Id;
 import org.apache.tapestry.ioc.annotations.InjectService;
 import org.apache.tapestry.services.Request;
 import org.apache.tapestry.services.RequestFilter;
@@ -17,10 +15,8 @@
  * This module is automatically included as part of the Tapestry IoC Registry, it's a good place to
  * configure and extend Tapestry, or to place your own services.
  */
-@Id("app")
 public class AppModule
 {
-    @Contribute("tapestry.ioc.ApplicationDefaults")
     public static void contributeApplicationDefaults(
             MappedConfiguration<String, String> configuration)
     {
@@ -70,8 +66,7 @@
      * we extend Tapestry using the timing filter. A common use for this kind of filter is transaction
      * management or auditting.
      */
-    @Contribute("tapestry.RequestHandler")
-    public void contributeRequestFilters(OrderedConfiguration<RequestFilter> configuration,
+    public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration,
             @InjectService("TimingFilter")
             RequestFilter filter)
     {
@@ -82,7 +77,4 @@
         
         configuration.add("Timing", filter);
     }
-
-
-
 }