Author: lincolnthree Date: 2010-04-05 14:50:38 -0400 (Mon, 05 Apr 2010) New Revision: 12389 Added: modules/faces/trunk/api/src/main/java/javax/ modules/faces/trunk/api/src/main/java/javax/faces/ modules/faces/trunk/api/src/main/java/javax/faces/bean/ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/End.java Removed: modules/faces/trunk/impl/src/main/java/javax/faces/bean/ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/End.java Log: Moved more classes to API Copied: modules/faces/trunk/api/src/main/java/javax/faces/bean (from rev 12385, modules/faces/trunk/impl/src/main/java/javax/faces/bean) Copied: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java (from rev 12385, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java) =================================================================== --- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java (rev 0) +++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java 2010-04-05 18:50:38 UTC (rev 12389) @@ -0,0 +1,60 @@ +package org.jboss.seam.faces.context.conversation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.Conversation; +import javax.enterprise.util.Nonbinding; +import javax.interceptor.InterceptorBinding; + +/** + * Begins a persistent {@link Conversation}. + * + *<p> + * <b>Note:</b> Unless the exception is of a permitted type, if this method + * throws an exception, the conversation will not begin. + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +@ConversationBoundary +@InterceptorBinding +@Target( { METHOD, TYPE }) +@Retention(RUNTIME) +public @interface Begin +{ + /** + * Sets the new {@link Conversation} ID. Seam will Generate a conversation ID + * if left blank. + * <p> + * If a conversation with the ID already exists... TODO what should we do? + * <p> + * TODO test default conversation ID functionality + */ + @Nonbinding + String id() default ""; + + /** + * Sets the {@link Conversation} timeout period, in milliseconds (E.g.: 5000 + * = 5 seconds.) + * <p> + * TODO implement timeout support on @Begin + */ + @Nonbinding + long timeout() default -1; + + /** + * Sets the exception types for which, when encountered during a method + * invocation, the {@link Conversation} will still begin. (In other words: + * Permitted exceptions do not abort @{@link Begin}) + * <p> + * <b>By default:</b> { empty array } - all encountered exceptions will + * prevent the {@link Conversation} from beginning. + */ + @Nonbinding + Class<? extends Exception>[] permit() default {}; + +} \ No newline at end of file Added: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java =================================================================== --- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java (rev 0) +++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java 2010-04-05 18:50:38 UTC (rev 12389) @@ -0,0 +1,29 @@ +package org.jboss.seam.faces.context.conversation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.interceptor.InterceptorBinding; + +/** + * Parent annotation for @{@link Begin} and @{@link End} + * <p> + * <b>Note:</b> This should never be used. + * <p> + * TODO: Should we warn at startup if @{@link Begin} and @{@link End} are used + * together on the same method? + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +@InterceptorBinding +@Inherited +@Target( { METHOD, TYPE }) +@Retention(RUNTIME) +@interface ConversationBoundary +{ +} \ No newline at end of file Copied: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/End.java (from rev 12385, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/End.java) =================================================================== --- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/End.java (rev 0) +++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/End.java 2010-04-05 18:50:38 UTC (rev 12389) @@ -0,0 +1,40 @@ +package org.jboss.seam.faces.context.conversation; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.Conversation; +import javax.enterprise.util.Nonbinding; +import javax.interceptor.InterceptorBinding; + +/** + * Ends a persistent {@link Conversation}. + * + *<p> + * <b>Note:</b> Unless the exception is of a permitted type, if this method + * throws an exception, the conversation will not be ended. + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +@ConversationBoundary +@InterceptorBinding +@Target( { METHOD, TYPE }) +@Retention(RUNTIME) +public @interface End +{ + /** + * Sets the exception types for which, when encountered during a method + * invocation, the {@link Conversation} will still end. (In other words: + * These exceptions do not abort @{@link End}) + * <p> + * <b>By default:</b> { empty array } - all encountered exceptions will cause + * the {@link Conversation} to remain open. + */ + @Nonbinding + Class<? extends Exception>[] permit() default {}; + +} \ No newline at end of file Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java 2010-04-05 18:46:24 UTC (rev 12388) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java 2010-04-05 18:50:38 UTC (rev 12389) @@ -1,60 +0,0 @@ -package org.jboss.seam.faces.context.conversation; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.enterprise.context.Conversation; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; - -/** - * Begins a persistent {@link Conversation}. - * - *<p> - * <b>Note:</b> Unless the exception is of a permitted type, if this method - * throws an exception, the conversation will not begin. - * - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - */ -@ConversationBoundary -@InterceptorBinding -@Target( { METHOD, TYPE }) -@Retention(RUNTIME) -public @interface Begin -{ - /** - * Sets the new {@link Conversation} ID. Seam will Generate a conversation ID - * if left blank. - * <p> - * If a conversation with the ID already exists... TODO what should we do? - * <p> - * TODO test default conversation ID functionality - */ - @Nonbinding - String id() default ""; - - /** - * Sets the {@link Conversation} timeout period, in milliseconds (E.g.: 5000 - * = 5 seconds.) - * <p> - * TODO implement timeout support on @Begin - */ - @Nonbinding - long timeout() default -1; - - /** - * Sets the exception types for which, when encountered during a method - * invocation, the {@link Conversation} will still begin. (In other words: - * Permitted exceptions do not abort @{@link Begin}) - * <p> - * <b>By default:</b> { empty array } - all encountered exceptions will - * prevent the {@link Conversation} from beginning. - */ - @Nonbinding - Class<? extends Exception>[] permit() default {}; - -} \ No newline at end of file Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java 2010-04-05 18:46:24 UTC (rev 12388) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java 2010-04-05 18:50:38 UTC (rev 12389) @@ -1,29 +0,0 @@ -package org.jboss.seam.faces.context.conversation; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.interceptor.InterceptorBinding; - -/** - * Parent annotation for @{@link Begin} and @{@link End} - * <p> - * <b>Note:</b> This should never be used. - * <p> - * TODO: Should we warn at startup if @{@link Begin} and @{@link End} are used - * together on the same method? - * - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - */ -@InterceptorBinding -@Inherited -@Target( { METHOD, TYPE }) -@Retention(RUNTIME) -@interface ConversationBoundary -{ -} \ No newline at end of file Deleted: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/End.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/End.java 2010-04-05 18:46:24 UTC (rev 12388) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/End.java 2010-04-05 18:50:38 UTC (rev 12389) @@ -1,40 +0,0 @@ -package org.jboss.seam.faces.context.conversation; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.enterprise.context.Conversation; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; - -/** - * Ends a persistent {@link Conversation}. - * - *<p> - * <b>Note:</b> Unless the exception is of a permitted type, if this method - * throws an exception, the conversation will not be ended. - * - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - */ -@ConversationBoundary -@InterceptorBinding -@Target( { METHOD, TYPE }) -@Retention(RUNTIME) -public @interface End -{ - /** - * Sets the exception types for which, when encountered during a method - * invocation, the {@link Conversation} will still end. (In other words: - * These exceptions do not abort @{@link End}) - * <p> - * <b>By default:</b> { empty array } - all encountered exceptions will cause - * the {@link Conversation} to remain open. - */ - @Nonbinding - Class<? extends Exception>[] permit() default {}; - -} \ No newline at end of file