Seam SVN: r12391 - in modules/faces/trunk: impl and 4 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 15:22:20 -0400 (Mon, 05 Apr 2010)
New Revision: 12391
Modified:
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/util/Annotations.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java
Log:
@Begin supports timeout()
Modified: 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/Begin.java 2010-04-05 19:01:03 UTC (rev 12390)
+++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java 2010-04-05 19:22:20 UTC (rev 12391)
@@ -41,7 +41,6 @@
* 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;
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/impl/pom.xml 2010-04-05 19:01:03 UTC (rev 12390)
+++ modules/faces/trunk/impl/pom.xml 2010-04-05 19:22:20 UTC (rev 12391)
@@ -36,6 +36,7 @@
<artifactId>seam-faces-api</artifactId>
<groupId>org.jboss.seam.faces</groupId>
<version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java 2010-04-05 19:01:03 UTC (rev 12390)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java 2010-04-05 19:22:20 UTC (rev 12391)
@@ -42,14 +42,14 @@
try
{
- if (Annotations.hasAnnotation(ctx.getMethod(), Begin.class))
+ if (Annotations.has(ctx.getMethod(), Begin.class))
{
beginConversation(ctx);
}
result = ctx.proceed();
- if (Annotations.hasAnnotation(ctx.getMethod(), End.class))
+ if (Annotations.has(ctx.getMethod(), End.class))
{
endConversation(ctx);
}
@@ -66,7 +66,7 @@
private void handleExceptionBegin(final InvocationContext ctx, final Exception e)
{
- if (Annotations.hasAnnotation(ctx.getMethod(), Begin.class))
+ if (Annotations.has(ctx.getMethod(), Begin.class))
{
List<? extends Class<? extends Exception>> typesPermittedByBegin = getPermittedExceptionTypesBegin(ctx.getMethod());
for (Class<? extends Exception> type : typesPermittedByBegin)
@@ -83,7 +83,7 @@
private void handleExceptionEnd(final InvocationContext ctx, final Exception e)
{
- if (Annotations.hasAnnotation(ctx.getMethod(), End.class))
+ if (Annotations.has(ctx.getMethod(), End.class))
{
List<? extends Class<? extends Exception>> typesPermittedByEnd = getPermittedExceptionTypesEnd(ctx.getMethod());
boolean permitted = false;
@@ -104,7 +104,7 @@
private void beginConversation(final InvocationContext ctx) throws Exception
{
- String cid = getConversationId(ctx.getMethod());
+ String cid = Annotations.get(ctx.getMethod(), Begin.class).id();
if ((cid != null) && !"".equals(cid))
{
conversation.begin(cid);
@@ -113,6 +113,13 @@
{
conversation.begin();
}
+
+ long timeout = Annotations.get(ctx.getMethod(), Begin.class).timeout();
+ if (timeout != -1)
+ {
+ conversation.setTimeout(timeout);
+ }
+
log.debug("Began conversation: (#0) before method: (#1.#2(...))", new Object[] { conversation.getId(), ctx.getMethod().getDeclaringClass().getName(), ctx.getMethod().getName() });
}
@@ -122,18 +129,13 @@
conversation.end();
}
- private String getConversationId(final Method m)
- {
- return Annotations.getAnnotation(m, Begin.class).id();
- }
-
private List<? extends Class<? extends Exception>> getPermittedExceptionTypesBegin(final Method m)
{
- return Arrays.asList(Annotations.getAnnotation(m, Begin.class).permit());
+ return Arrays.asList(Annotations.get(m, Begin.class).permit());
}
private List<? extends Class<? extends Exception>> getPermittedExceptionTypesEnd(final Method m)
{
- return Arrays.asList(Annotations.getAnnotation(m, End.class).permit());
+ return Arrays.asList(Annotations.get(m, End.class).permit());
}
}
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/util/Annotations.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/util/Annotations.java 2010-04-05 19:01:03 UTC (rev 12390)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/util/Annotations.java 2010-04-05 19:22:20 UTC (rev 12391)
@@ -27,7 +27,7 @@
* the declaring class of the method. Returns false if the annotation
* is not present.
*/
- public static boolean hasAnnotation(final Method m, final Class<? extends Annotation> type)
+ public static boolean has(final Method m, final Class<? extends Annotation> type)
{
boolean result = false;
if (m.isAnnotationPresent(type))
@@ -47,7 +47,7 @@
if (result == false)
{
- result = hasAnnotation(m.getDeclaringClass(), type);
+ result = has(m.getDeclaringClass(), type);
}
return result;
}
@@ -62,7 +62,7 @@
* @return True if annotation is present either on class, false if the
* annotation is not present.
*/
- public static boolean hasAnnotation(final Class<?> c, final Class<? extends Annotation> type)
+ public static boolean has(final Class<?> c, final Class<? extends Annotation> type)
{
boolean result = false;
if (c.isAnnotationPresent(type))
@@ -92,7 +92,7 @@
* @return The annotation instance found on this method or enclosing class,
* or null if no matching annotation was found.
*/
- public static <A extends Annotation> A getAnnotation(final Method m, final Class<A> type)
+ public static <A extends Annotation> A get(final Method m, final Class<A> type)
{
A result = m.getAnnotation(type);
if (result == null)
@@ -107,7 +107,7 @@
}
if (result == null)
{
- result = getAnnotation(m.getDeclaringClass(), type);
+ result = get(m.getDeclaringClass(), type);
}
return result;
}
@@ -122,7 +122,7 @@
* @return The annotation instance found on this class, or null if no
* matching annotation was found.
*/
- public static <A extends Annotation> A getAnnotation(final Class<?> c, final Class<A> type)
+ public static <A extends Annotation> A get(final Class<?> c, final Class<A> type)
{
A result = c.getAnnotation(type);
if (result == null)
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java 2010-04-05 19:01:03 UTC (rev 12390)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java 2010-04-05 19:22:20 UTC (rev 12391)
@@ -3,6 +3,7 @@
*/
package org.jboss.seam.faces.context.conversation;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -51,6 +52,19 @@
}
@Test
+ public void testConversationStartedWithTimeout()
+ {
+ assertTrue(conversation.isTransient());
+ assertFalse(interceptedBean.isConversationLongRunningInsideMethodCall());
+
+ interceptedBean.beginConversation();
+
+ assertEquals(1000, conversation.getTimeout());
+ assertFalse(conversation.isTransient());
+ assertTrue(interceptedBean.isConversationLongRunningInsideMethodCall());
+ }
+
+ @Test
public void testConversationBeginsAndEnds()
{
assertTrue(conversation.isTransient());
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java 2010-04-05 19:01:03 UTC (rev 12390)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java 2010-04-05 19:22:20 UTC (rev 12391)
@@ -32,7 +32,7 @@
{
}
- @Begin
+ @Begin(timeout = 1000)
public void beginConversation()
{
if (!conversation.isTransient())
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java 2010-04-05 19:01:03 UTC (rev 12390)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java 2010-04-05 19:22:20 UTC (rev 12391)
@@ -21,8 +21,8 @@
{
Method begin = AnnotationTestObject.class.getMethod("begin", new Class[] {});
- assertTrue(Annotations.hasAnnotation(begin, Begin.class));
- assertFalse(Annotations.hasAnnotation(begin, End.class));
+ assertTrue(Annotations.has(begin, Begin.class));
+ assertFalse(Annotations.has(begin, End.class));
}
@Test
@@ -30,7 +30,7 @@
{
Method end = AnnotationTestObject.class.getMethod("end", new Class[] {});
- assertTrue(Annotations.hasAnnotation(end, End.class));
+ assertTrue(Annotations.has(end, End.class));
}
@Test
@@ -39,14 +39,14 @@
Method begin = AnnotationTestObject.class.getMethod("begin", new Class[] {});
Method end = AnnotationTestObject.class.getMethod("end", new Class[] {});
- assertTrue(Annotations.hasAnnotation(begin, Begin.class));
- assertTrue(Annotations.hasAnnotation(end, Begin.class));
+ assertTrue(Annotations.has(begin, Begin.class));
+ assertTrue(Annotations.has(end, Begin.class));
}
public void testGetAnnotationOnMethodDirectly() throws Exception
{
Method end = AnnotationTestObject.class.getMethod("end", new Class[] {});
- End anno = Annotations.getAnnotation(end, End.class);
+ End anno = Annotations.get(end, End.class);
assertTrue(anno instanceof End);
}
@@ -54,7 +54,7 @@
public void testGetAnnotationOnMethodIndirectlyFromClass() throws Exception
{
Method end = AnnotationTestObject.class.getMethod("begin", new Class[] {});
- Begin anno = Annotations.getAnnotation(end, Begin.class);
+ Begin anno = Annotations.get(end, Begin.class);
assertTrue(anno instanceof Begin);
}
14 years, 9 months
Seam SVN: r12390 - in modules/faces/trunk/impl/src/main/java: org/jboss/seam/faces and 1 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 15:01:03 -0400 (Mon, 05 Apr 2010)
New Revision: 12390
Added:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/
Removed:
modules/faces/trunk/impl/src/main/java/javax/faces/
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/producer/
Modified:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java
Log:
repackaged and removed empty package
Copied: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment (from rev 12388, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/producer)
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/producer/ExternalContextProducer.java 2010-04-05 18:46:24 UTC (rev 12388)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java 2010-04-05 19:01:03 UTC (rev 12390)
@@ -1,5 +1,5 @@
//$Id: FacesContext.java 5350 2007-06-20 17:53:19Z gavin $
-package org.jboss.seam.faces.producer;
+package org.jboss.seam.faces.environment;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/producer/FacesContextProducer.java 2010-04-05 18:46:24 UTC (rev 12388)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java 2010-04-05 19:01:03 UTC (rev 12390)
@@ -1,5 +1,5 @@
//$Id: FacesContext.java 5350 2007-06-20 17:53:19Z gavin $
-package org.jboss.seam.faces.producer;
+package org.jboss.seam.faces.environment;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/producer/NavigationHandlerProducer.java 2010-04-05 18:46:24 UTC (rev 12388)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java 2010-04-05 19:01:03 UTC (rev 12390)
@@ -1,5 +1,5 @@
//$Id: FacesContext.java 5350 2007-06-20 17:53:19Z gavin $
-package org.jboss.seam.faces.producer;
+package org.jboss.seam.faces.environment;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
14 years, 9 months
Seam SVN: r12389 - in modules/faces/trunk: api/src/main/java/javax and 6 other directories.
by seam-commits＠lists.jboss.org
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
14 years, 9 months
Seam SVN: r12388 - in modules/faces/trunk: api and 8 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 14:46:24 -0400 (Mon, 05 Apr 2010)
New Revision: 12388
Added:
modules/faces/trunk/api/src/main/java/org/
modules/faces/trunk/api/src/main/java/org/jboss/
modules/faces/trunk/api/src/main/java/org/jboss/seam/
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/
Removed:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/qualifier/
Modified:
modules/faces/trunk/api/pom.xml
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/pom.xml
Log:
Moved several interface classes to API
Modified: modules/faces/trunk/api/pom.xml
===================================================================
--- modules/faces/trunk/api/pom.xml 2010-04-05 18:39:47 UTC (rev 12387)
+++ modules/faces/trunk/api/pom.xml 2010-04-05 18:46:24 UTC (rev 12388)
@@ -31,17 +31,4 @@
</repository>
</repositories>
- <profiles>
- <profile>
- <id>arquillian-glassfish-embedded-30</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-embedded-30</artifactId>
- <version>${arquillian.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
Copied: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier (from rev 12385, modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/qualifier)
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/impl/pom.xml 2010-04-05 18:39:47 UTC (rev 12387)
+++ modules/faces/trunk/impl/pom.xml 2010-04-05 18:46:24 UTC (rev 12388)
@@ -13,11 +13,6 @@
<packaging>jar</packaging>
<name>Seam Faces Module Core Implementation</name>
-
- <properties>
- <arquillian.version>1.0.0.Alpha1</arquillian.version>
- <jsfmock.version>1.0.0</jsfmock.version>
- </properties>
<!-- Snapshots repo to get parent -->
<repositories>
@@ -34,97 +29,14 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
-
- <repository>
- <id>java.net</id>
- <name>Java.net Maven2 Repository</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
</repositories>
<dependencies>
-
<dependency>
<artifactId>seam-faces-api</artifactId>
<groupId>org.jboss.seam.faces</groupId>
<version>${project.version}</version>
</dependency>
-
- <!-- Environment Dependencies -->
- <dependency>
- <!-- This is necessary until a new JSF-API is published to central -->
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
- <version>1.0.0.Alpha1</version>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jsfunit</groupId>
- <artifactId>jboss-jsfunit-core</artifactId>
- <version>1.2.0.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <version>${jsfmock.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
- <profiles>
- <profile>
- <id>arquillian-glassfish-embedded-30</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-embedded-30</artifactId>
- <version>${arquillian.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-04-05 18:39:47 UTC (rev 12387)
+++ modules/faces/trunk/pom.xml 2010-04-05 18:46:24 UTC (rev 12388)
@@ -27,7 +27,99 @@
<!-- <module>docs</module>
<module>examples</module> -->
</modules>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>Java.net Maven2 Repository</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
+
+ <properties>
+ <arquillian.version>1.0.0.Alpha1</arquillian.version>
+ <jsfmock.version>1.0.0</jsfmock.version>
+ </properties>
+
+ <dependencies>
+
+ <!-- Environment Dependencies -->
+ <dependency>
+ <!-- This is necessary until a new JSF-API is published to central -->
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions</artifactId>
+ <version>1.0.0.Alpha1</version>
+ </dependency>
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-embedded</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jsfunit</groupId>
+ <artifactId>jboss-jsfunit-core</artifactId>
+ <version>1.2.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>${jsfmock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>arquillian-glassfish-embedded-30</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-embedded-30</artifactId>
+ <version>${arquillian.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<developers>
<developer>
<name>Lincoln Baxter, III</name>
14 years, 9 months
Seam SVN: r12387 - in modules/faces/trunk: api and 1 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 14:39:47 -0400 (Mon, 05 Apr 2010)
New Revision: 12387
Modified:
modules/faces/trunk/api/pom.xml
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/pom.xml
Log:
Modified: modules/faces/trunk/api/pom.xml
===================================================================
--- modules/faces/trunk/api/pom.xml 2010-04-05 18:35:49 UTC (rev 12386)
+++ modules/faces/trunk/api/pom.xml 2010-04-05 18:39:47 UTC (rev 12387)
@@ -12,7 +12,7 @@
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Seam Faces Module</name>
+ <name>Seam Faces Module API</name>
<!-- Snapshots repo to get parent -->
<repositories>
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/impl/pom.xml 2010-04-05 18:35:49 UTC (rev 12386)
+++ modules/faces/trunk/impl/pom.xml 2010-04-05 18:39:47 UTC (rev 12387)
@@ -12,7 +12,7 @@
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Seam Faces Module</name>
+ <name>Seam Faces Module Core Implementation</name>
<properties>
<arquillian.version>1.0.0.Alpha1</arquillian.version>
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-04-05 18:35:49 UTC (rev 12386)
+++ modules/faces/trunk/pom.xml 2010-04-05 18:39:47 UTC (rev 12387)
@@ -13,7 +13,7 @@
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Seam Faces Module</name>
+ <name>Seam Faces Module Parent POM</name>
<description>
The Parent for Seam Faces Modules
@@ -22,10 +22,10 @@
<url>http://www.seamframework.org</url>
<modules>
+ <module>api</module>
<module>impl</module>
- <module>api</module>
- <module>docs</module>
- <module>examples</module>
+ <!-- <module>docs</module>
+ <module>examples</module> -->
</modules>
<developers>
14 years, 9 months
Seam SVN: r12386 - in modules/faces/trunk: impl and 1 other directory.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 14:35:49 -0400 (Mon, 05 Apr 2010)
New Revision: 12386
Removed:
modules/faces/trunk/impl/build/
Modified:
modules/faces/trunk/api/
Log:
SVN:ignores
Property changes on: modules/faces/trunk/api
___________________________________________________________________
Name: svn:ignore
+ .settings
build
target
.classpath
.project
14 years, 9 months
Seam SVN: r12385 - in modules/faces/trunk: api and 4 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 14:34:00 -0400 (Mon, 05 Apr 2010)
New Revision: 12385
Added:
modules/faces/trunk/api/
modules/faces/trunk/api/pom.xml
modules/faces/trunk/api/src/
modules/faces/trunk/api/src/main/
modules/faces/trunk/api/src/main/java/
modules/faces/trunk/api/src/main/resources/
modules/faces/trunk/api/src/test/
modules/faces/trunk/api/src/test/java/
modules/faces/trunk/api/src/test/resources/
modules/faces/trunk/docs/
modules/faces/trunk/examples/
modules/faces/trunk/impl/
Removed:
modules/faces/trunk/core/
Modified:
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/pom.xml
Log:
Restructured for API/IMPL
Added: modules/faces/trunk/api/pom.xml
===================================================================
--- modules/faces/trunk/api/pom.xml (rev 0)
+++ modules/faces/trunk/api/pom.xml 2010-04-05 18:34:00 UTC (rev 12385)
@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>seam-faces-parent</artifactId>
+ <groupId>org.jboss.seam.faces</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>seam-faces-api</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+
+ <packaging>jar</packaging>
+ <name>Seam Faces Module</name>
+
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>arquillian-glassfish-embedded-30</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-embedded-30</artifactId>
+ <version>${arquillian.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
Copied: modules/faces/trunk/impl (from rev 12384, modules/faces/trunk/core)
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/core/pom.xml 2010-04-05 18:07:11 UTC (rev 12384)
+++ modules/faces/trunk/impl/pom.xml 2010-04-05 18:34:00 UTC (rev 12385)
@@ -13,30 +13,7 @@
<packaging>jar</packaging>
<name>Seam Faces Module</name>
-
- <developers>
- <developer>
- <name>Lincoln Baxter, III</name>
- <email>lincolnbaxter(a)gmail.com</email>
- <url>http://ocpsoft.com</url>
- <organization>JBoss, by Red Hat</organization>
- <organizationUrl>http://jboss.org</organizationUrl>
- <timezone>EST</timezone>
- <roles>
- <role>Project Lead</role>
- </roles>
- </developer>
- <developer>
- <name>Dan Allen</name>
- <organization>JBoss, by Red Hat</organization>
- <organizationUrl>http://jboss.org</organizationUrl>
- <timezone>EST</timezone>
- <roles>
- <role>Project Lead</role>
- </roles>
- </developer>
- </developers>
-
+
<properties>
<arquillian.version>1.0.0.Alpha1</arquillian.version>
<jsfmock.version>1.0.0</jsfmock.version>
@@ -67,6 +44,12 @@
<dependencies>
+ <dependency>
+ <artifactId>seam-faces-api</artifactId>
+ <groupId>org.jboss.seam.faces</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- Environment Dependencies -->
<dependency>
<!-- This is necessary until a new JSF-API is published to central -->
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-04-05 18:07:11 UTC (rev 12384)
+++ modules/faces/trunk/pom.xml 2010-04-05 18:34:00 UTC (rev 12385)
@@ -22,9 +22,35 @@
<url>http://www.seamframework.org</url>
<modules>
- <module>core</module>
+ <module>impl</module>
+ <module>api</module>
+ <module>docs</module>
+ <module>examples</module>
</modules>
+ <developers>
+ <developer>
+ <name>Lincoln Baxter, III</name>
+ <email>lincolnbaxter(a)gmail.com</email>
+ <url>http://ocpsoft.com</url>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://jboss.org</organizationUrl>
+ <timezone>EST</timezone>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://jboss.org</organizationUrl>
+ <timezone>EST</timezone>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ </developer>
+ </developers>
+
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/trunk </connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/faces/trunk </developerConnection>
14 years, 9 months
Seam SVN: r12384 - modules/faces/trunk.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 14:07:11 -0400 (Mon, 05 Apr 2010)
New Revision: 12384
Modified:
modules/faces/trunk/pom.xml
Log:
Java compiler set to 1.6
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-04-05 17:56:02 UTC (rev 12383)
+++ modules/faces/trunk/pom.xml 2010-04-05 18:07:11 UTC (rev 12384)
@@ -38,8 +38,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
</plugins>
14 years, 9 months
Seam SVN: r12382 - in modules/faces/trunk: core and 1 other directory.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-05 13:53:36 -0400 (Mon, 05 Apr 2010)
New Revision: 12382
Added:
modules/faces/trunk/core/
modules/faces/trunk/core/pom.xml
modules/faces/trunk/core/src/
Removed:
modules/faces/trunk/pom.xml
modules/faces/trunk/src/
Log:
Repackaged into seam-faces-parent and seam-faces(core)
Copied: modules/faces/trunk/core/pom.xml (from rev 12381, modules/faces/trunk/pom.xml)
===================================================================
--- modules/faces/trunk/core/pom.xml (rev 0)
+++ modules/faces/trunk/core/pom.xml 2010-04-05 17:53:36 UTC (rev 12382)
@@ -0,0 +1,147 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>seam-faces-parent</artifactId>
+ <groupId>org.jboss.seam.faces</groupId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>seam-faces</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+
+ <packaging>jar</packaging>
+ <name>Seam Faces Module</name>
+
+ <developers>
+ <developer>
+ <name>Lincoln Baxter, III</name>
+ <email>lincolnbaxter(a)gmail.com</email>
+ <url>http://ocpsoft.com</url>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://jboss.org</organizationUrl>
+ <timezone>EST</timezone>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Dan Allen</name>
+ <organization>JBoss, by Red Hat</organization>
+ <organizationUrl>http://jboss.org</organizationUrl>
+ <timezone>EST</timezone>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <properties>
+ <arquillian.version>1.0.0.Alpha1</arquillian.version>
+ <jsfmock.version>1.0.0</jsfmock.version>
+ </properties>
+
+ <!-- Snapshots repo to get parent -->
+ <repositories>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
+ </url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>java.net</id>
+ <name>Java.net Maven2 Repository</name>
+ <url>http://download.java.net/maven/2/</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+
+ <!-- Environment Dependencies -->
+ <dependency>
+ <!-- This is necessary until a new JSF-API is published to central -->
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions</artifactId>
+ <version>1.0.0.Alpha1</version>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-embedded</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jsfunit</groupId>
+ <artifactId>jboss-jsfunit-core</artifactId>
+ <version>1.2.0.Final</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-jsf</groupId>
+ <artifactId>jsf-mock</artifactId>
+ <version>${jsfmock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>arquillian-glassfish-embedded-30</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-glassfish-embedded-30</artifactId>
+ <version>${arquillian.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
Copied: modules/faces/trunk/core/src (from rev 12381, modules/faces/trunk/src)
Deleted: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-04-05 11:15:13 UTC (rev 12381)
+++ modules/faces/trunk/pom.xml 2010-04-05 17:53:36 UTC (rev 12382)
@@ -1,153 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>seam-parent</artifactId>
- <groupId>org.jboss.seam</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>seam-faces</artifactId>
- <version>3.0.0-SNAPSHOT</version>
-
- <packaging>jar</packaging>
- <name>Seam Faces Module</name>
-
- <developers>
- <developer>
- <name>Lincoln Baxter, III</name>
- <email>lincolnbaxter(a)gmail.com</email>
- <url>http://ocpsoft.com</url>
- <organization>JBoss, by Red Hat</organization>
- <organizationUrl>http://jboss.org</organizationUrl>
- <timezone>EST</timezone>
- <roles>
- <role>Project Lead</role>
- </roles>
- </developer>
- <developer>
- <name>Dan Allen</name>
- <organization>JBoss, by Red Hat</organization>
- <organizationUrl>http://jboss.org</organizationUrl>
- <timezone>EST</timezone>
- <roles>
- <role>Project Lead</role>
- </roles>
- </developer>
- </developers>
-
- <properties>
- <arquillian.version>1.0.0.Alpha1</arquillian.version>
- <jsfmock.version>1.0.0</jsfmock.version>
- </properties>
-
- <!-- Snapshots repo to get parent -->
- <repositories>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
-
- <repository>
- <id>java.net</id>
- <name>Java.net Maven2 Repository</name>
- <url>http://download.java.net/maven/2/</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <!-- Environment Dependencies -->
- <dependency>
- <!-- This is necessary until a new JSF-API is published to central -->
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
- <version>1.0.0.Alpha1</version>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jsfunit</groupId>
- <artifactId>jboss-jsfunit-core</artifactId>
- <version>1.2.0.Final</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.test-jsf</groupId>
- <artifactId>jsf-mock</artifactId>
- <version>${jsfmock.version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>arquillian-glassfish-embedded-30</id>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-embedded-30</artifactId>
- <version>${arquillian.version}</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/trunk </connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/faces/trunk </developerConnection>
- <url>http://fisheye.jboss.org/browse/Seam/modules/faces/trunk</url>
- </scm>
-
-</project>
14 years, 9 months