Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SessionState.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SessionState.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SessionState.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SessionState.java Sat Jul 18 04:06:58 2009 @@ -20,6 +20,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*; +import org.apache.tapestry5.ioc.annotations.UseWith; + /** * Marker annotation for a field that is a <em>session state object</em> (SSO) as controlled by the {...@link * org.apache.tapestry5.services.ApplicationStateManager}. An SSO stored as global session object (i.e., in the {...@link @@ -41,6 +44,7 @@ @Target(FIELD) @Documented @Retention(RUNTIME) +...@usewith({COMPONENT,MIXIN,PAGE}) public @interface SessionState { /**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2009 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. @@ -19,6 +19,8 @@ import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*; +import org.apache.tapestry5.ioc.annotations.UseWith; /** * Marker annotation for methods that should be executed during the SetupRender phase. Such methods may optionally take @@ -29,6 +31,7 @@ @Target(ElementType.METHOD) @Retention(RUNTIME) @Documented +...@usewith({COMPONENT,MIXIN,PAGE}) public @interface SetupRender { Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007 The Apache Software Foundation +// Copyright 2006, 2007, 2009 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. @@ -15,6 +15,7 @@ package org.apache.tapestry5.annotations; import org.apache.tapestry5.model.ComponentModel; +import org.apache.tapestry5.ioc.annotations.UseWith; import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.TYPE; @@ -23,6 +24,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*; + /** * Used to identify a component that can support informal parameters. By default, components do not support informal * parameters. @@ -33,6 +36,7 @@ @Retention(RUNTIME) @Documented @Inherited +...@usewith({COMPONENT,MIXIN}) public @interface SupportsInformalParameters { Modified: tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java (original) +++ tapestry/tapestry5/trunk/tapestry-hibernate-core/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java Sat Jul 18 04:06:58 2009 @@ -14,12 +14,17 @@ package org.apache.tapestry5.hibernate.annotations; +import org.apache.tapestry5.ioc.annotations.UseWith; +import org.apache.tapestry5.ioc.annotations.AnnotationUseContext; + import java.lang.annotation.Documented; import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static org.apache.tapestry5.ioc.annotations.AnnotationUseContext.*; + /** * Marks a method of a service (or a component method) as transactional: the active transaction should {...@linkplain * org.apache.tapestry5.hibernate.HibernateSessionManager#commit() commit} after invoking the method. Runtime @@ -31,6 +36,7 @@ @Target(METHOD) @Retention(RUNTIME) @Documented +...@usewith({COMPONENT, MIXIN, PAGE}) public @interface CommitAfter { Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/EagerLoad.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007 The Apache Software Foundation +// Copyright 2006, 2007, 2009 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. @@ -33,6 +33,7 @@ { TYPE, METHOD }) @Retention(RUNTIME) @Documented +...@usewith(AnnotationUseContext.SERVICE) public @interface EagerLoad { Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Marker.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2007 The Apache Software Foundation +// Copyright 2007, 2009 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. @@ -37,6 +37,7 @@ { TYPE, METHOD }) @Retention(RUNTIME) @Documented +...@usewith({AnnotationUseContext.SERVICE, AnnotationUseContext.MODULE}) public @interface Marker { /** Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Match.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2009 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. @@ -34,6 +34,7 @@ @Target(METHOD) @Retention(RUNTIME) @Documented +...@usewith(AnnotationUseContext.SERVICE_DECORATOR) public @interface Match { Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/NotLazy.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/NotLazy.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/NotLazy.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/NotLazy.java Sat Jul 18 04:06:58 2009 @@ -25,6 +25,7 @@ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented +...@usewith(AnnotationUseContext.SERVICE) public @interface NotLazy { } Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Order.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Order.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Order.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Order.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2009 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. @@ -29,6 +29,7 @@ @Target(METHOD) @Retention(RUNTIME) @Documented +...@usewith(AnnotationUseContext.SERVICE_DECORATOR) public @interface Order { /** Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/PreventServiceDecoration.java Sat Jul 18 04:06:58 2009 @@ -35,6 +35,7 @@ @Target({ ElementType.TYPE, ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @Documented +...@usewith(AnnotationUseContext.SERVICE) public @interface PreventServiceDecoration { } Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/Scope.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007, 2008 The Apache Software Foundation +// Copyright 2006, 2007, 2008, 2009 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. @@ -42,6 +42,7 @@ {TYPE, METHOD}) @Retention(RUNTIME) @Documented +...@usewith({AnnotationUseContext.SERVICE, AnnotationUseContext.MODULE}) public @interface Scope { /** Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/ServiceId.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/ServiceId.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/ServiceId.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/ServiceId.java Sat Jul 18 04:06:58 2009 @@ -29,6 +29,7 @@ @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Documented +...@usewith({AnnotationUseContext.SERVICE, AnnotationUseContext.MODULE}) public @interface ServiceId { /** Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/SubModule.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2009 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. @@ -27,6 +27,7 @@ @Target(TYPE) @Retention(RUNTIME) @Documented +...@usewith(AnnotationUseContext.MODULE) public @interface SubModule { Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesConfiguration.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesConfiguration.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesConfiguration.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesConfiguration.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2008 The Apache Software Foundation +// Copyright 2008, 2009 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. @@ -24,6 +24,7 @@ @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) @Documented +...@usewith(AnnotationUseContext.SERVICE) public @interface UsesConfiguration { /** Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesMappedConfiguration.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2008 The Apache Software Foundation +// Copyright 2008, 2009 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. @@ -26,6 +26,7 @@ @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) @Documented +...@usewith(AnnotationUseContext.SERVICE) public @interface UsesMappedConfiguration { /** Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesOrderedConfiguration.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesOrderedConfiguration.java?rev=795307&r1=795306&r2=795307&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesOrderedConfiguration.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotations/UsesOrderedConfiguration.java Sat Jul 18 04:06:58 2009 @@ -1,4 +1,4 @@ -// Copyright 2008 The Apache Software Foundation +// Copyright 2008, 2009 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,6 +23,7 @@ @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) @Documented +...@usewith(AnnotationUseContext.SERVICE) public @interface UsesOrderedConfiguration { /**
