Author: hlship Date: Tue Jul 20 17:15:41 2010 New Revision: 965920 URL: http://svn.apache.org/viewvc?rev=965920&view=rev Log: TAP5-1209: Marker annotations used with services that have contributions should be applicable to methods (as well as fields and parameters) for compatibility with @Contribute
Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClasses.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java Modified: tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java?rev=965920&r1=965919&r2=965920&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java (original) +++ tapestry/tapestry5/trunk/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java Tue Jul 20 17:15:41 2010 @@ -1,10 +1,10 @@ -// Copyright 2007, 2008, 2009 The Apache Software Foundation +// Copyright 2007, 2008, 2009, 2010 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -14,21 +14,22 @@ package org.apache.tapestry5.ioc.annotations; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** * Marker annotation used to denote a service that is the primary instance of some common interface. This is often used - * when a service is a {...@linkplain org.apache.tapestry5.ioc.services.ChainBuilder chain of command} or {...@linkplain - * org.apache.tapestry5.ioc.services.StrategyBuilder strategy-based} and, therefore, many services will implement the + * when a service is a {...@linkplain org.apache.tapestry5.ioc.services.ChainBuilder chain of command} or + * {...@linkplain org.apache.tapestry5.ioc.services.StrategyBuilder strategy-based} and, therefore, many services will + * implement the * same interface. */ @Target( - { PARAMETER, FIELD }) +{ ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD }) @Retention(RUNTIME) @Documented @UseWith(AnnotationUseContext.SERVICE) Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java?rev=965920&r1=965919&r2=965920&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java Tue Jul 20 17:15:41 2010 @@ -1,4 +1,4 @@ -// Copyright 2007, 2008 The Apache Software Foundation +// Copyright 2007, 2008, 2010 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import java.lang.annotation.*; * * @see ComponentEventRequestHandler */ -...@target({ ElementType.PARAMETER, ElementType.FIELD }) +...@target({ ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface Ajax Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java?rev=965920&r1=965919&r2=965920&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java Tue Jul 20 17:15:41 2010 @@ -1,4 +1,4 @@ -// Copyright 2007 The Apache Software Foundation +// Copyright 2007, 2010 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ package org.apache.tapestry5.services; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; @@ -27,7 +27,7 @@ import java.lang.annotation.Target; * assets located on the classpath. */ @Target( - { PARAMETER, FIELD }) + { ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD }) @Retention(RUNTIME) @Documented public @interface ClasspathProvider Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClasses.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClasses.java?rev=965920&r1=965919&r2=965920&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClasses.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClasses.java Tue Jul 20 17:15:41 2010 @@ -1,10 +1,10 @@ -// Copyright 2008 The Apache Software Foundation +// Copyright 2008, 2010 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -14,16 +14,20 @@ package org.apache.tapestry5.services; -import java.lang.annotation.*; - +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Marker annotation used to inject the correct {...@link org.apache.tapestry5.services.InvalidationEventHub} service - * reponsible for invalidations when underlying component class files are changed. - * + * responsible for invalidations when underlying component class files are changed. + * * @since 5.1.0.0 */ -...@target({ElementType.PARAMETER, ElementType.FIELD}) +...@target( +{ ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface ComponentClasses Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java?rev=965920&r1=965919&r2=965920&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java Tue Jul 20 17:15:41 2010 @@ -1,4 +1,4 @@ -// Copyright 2007 The Apache Software Foundation +// Copyright 2007, 2010 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ package org.apache.tapestry5.services; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** @@ -26,7 +26,7 @@ import java.lang.annotation.Target; * located in the web application context. */ @Target( - { PARAMETER, FIELD }) + { ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD }) @Retention(RUNTIME) @Documented public @interface ContextProvider Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java?rev=965920&r1=965919&r2=965920&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java Tue Jul 20 17:15:41 2010 @@ -1,10 +1,10 @@ -// Copyright 2007 The Apache Software Foundation +// Copyright 2007, 2010 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -14,18 +14,18 @@ package org.apache.tapestry5.services; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** * Marker annotation for services that are provided by the Tapestry core module. */ @Target( - { PARAMETER, FIELD }) +{ ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD }) @Retention(RUNTIME) @Documented public @interface Core Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java?rev=965920&r1=965919&r2=965920&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java Tue Jul 20 17:15:41 2010 @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -14,16 +14,20 @@ package org.apache.tapestry5.services; -import java.lang.annotation.*; - +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Marker annotation for a service that should be used for traditional page oriented requests, as opposed to Ajax * requests (that send ad-hoc or {...@linkplain PartialMarkupRenderer partial page markup} responses. - * + * * @see ComponentEventRequestHandler */ -...@target({ ElementType.PARAMETER, ElementType.FIELD }) +...@target( +{ ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented public @interface Traditional