March 2010 - seam-commits - Jboss List Archives

Seam SVN: r12316 - in modules/xml/trunk/core/src: test/java/org/jboss/seam/xml/test/fieldset and 1 other directories.

by seam-commits＠lists.jboss.org

Author: swd847 Date: 2010-03-30 00:29:25 -0400 (Tue, 30 Mar 2010) New Revision: 12316 Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java modules/xml/trunk/core/src/test/java/org/jboss/seam/xml/test/fieldset/FieldValueBean.java modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml Log: test of new field setter behavior Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java =================================================================== --- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java 2010-03-30 04:24:28 UTC (rev 12315) +++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java 2010-03-30 04:29:25 UTC (rev 12316) @@ -33,9 +33,7 @@ public void postConstruct(T instance) { - target.postConstruct(instance); - } public void preDestroy(T instance) Modified: modules/xml/trunk/core/src/test/java/org/jboss/seam/xml/test/fieldset/FieldValueBean.java =================================================================== --- modules/xml/trunk/core/src/test/java/org/jboss/seam/xml/test/fieldset/FieldValueBean.java 2010-03-30 04:24:28 UTC (rev 12315) +++ modules/xml/trunk/core/src/test/java/org/jboss/seam/xml/test/fieldset/FieldValueBean.java 2010-03-30 04:29:25 UTC (rev 12316) @@ -11,6 +11,11 @@ public class FieldValueBean { + public void init() + { + assert ivalue != 20; + } + private int ivalue = 20; public String stringValue; Modified: modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml =================================================================== --- modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-30 04:24:28 UTC (rev 12315) +++ modules/xml/trunk/core/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-30 04:29:25 UTC (rev 12316) @@ -4,6 +4,9 @@ <test:FieldValueBean> <override/> + <test:init> + <Inject/> + </test:init> <test:ivalue>10</test:ivalue> <test:stringValue>hello world</test:stringValue> <test:enumValue>A</test:enumValue>

14 years, 8 months

1
0
0 / 0

Seam SVN: r12315 - modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset.

by seam-commits＠lists.jboss.org

Author: swd847 Date: 2010-03-30 00:24:28 -0400 (Tue, 30 Mar 2010) New Revision: 12315 Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java Log: field values are now set before injection, rather than before PostConstruct Modified: modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java =================================================================== --- modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java 2010-03-29 21:53:24 UTC (rev 12314) +++ modules/xml/trunk/core/src/main/java/org/jboss/seam/xml/fieldset/InjectionTargetWrapper.java 2010-03-30 04:24:28 UTC (rev 12315) @@ -24,16 +24,16 @@ public void inject(T instance, CreationalContext<T> ctx) { + for (FieldValueObject f : fieldValues) + { + f.setValue(instance); + } target.inject(instance, ctx); - } public void postConstruct(T instance) { - for (FieldValueObject f : fieldValues) - { - f.setValue(instance); - } + target.postConstruct(instance); }

14 years, 8 months

1
0
0 / 0

Seam SVN: r12314 - in modules/faces/trunk/src/main/java/org/jboss/seam/faces: context/conversation and 1 other directory.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-03-29 17:53:24 -0400 (Mon, 29 Mar 2010) New Revision: 12314 Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java Log: * SUID, extra comments Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java 2010-03-29 20:49:03 UTC (rev 12313) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/SeamFacesException.java 2010-03-29 21:53:24 UTC (rev 12314) @@ -11,8 +11,9 @@ */ public class SeamFacesException extends RuntimeException { + private static final long serialVersionUID = -610838646516706170L; - public SeamFacesException(String string) + public SeamFacesException(final String string) { } Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java 2010-03-29 20:49:03 UTC (rev 12313) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java 2010-03-29 21:53:24 UTC (rev 12314) @@ -6,15 +6,18 @@ import javax.inject.Named; /** - * Exposes the {@link Conversation} under the simplified name "conversation" - * in addition to the default "javax.enterprise.context.conversation". This - * alias is provided for the page author's convenience. - * + * Exposes the {@link Conversation} under the simplified name "conversation" in + * addition to the default "javax.enterprise.context.conversation". This alias + * is provided for the page author's convenience. + * * @author Dan Allen */ public class NamedConversationAliasProducer { - public @Produces @Named @Typed() Conversation getConversation(Conversation conversation) + public @Produces + @Named + @Typed(/* no types - prevents injection */) + Conversation getConversation(final Conversation conversation) { return conversation; }

14 years, 8 months

1
0
0 / 0

Seam SVN: r12313 - in modules/xml/trunk: core and 2 other directories.

by seam-commits＠lists.jboss.org

Author: swd847 Date: 2010-03-29 16:49:03 -0400 (Mon, 29 Mar 2010) New Revision: 12313 Modified: modules/xml/trunk/core/pom.xml modules/xml/trunk/docs/pom.xml modules/xml/trunk/examples/princess-rescue/pom.xml modules/xml/trunk/pom.xml Log: updated artifact ids Modified: modules/xml/trunk/core/pom.xml =================================================================== --- modules/xml/trunk/core/pom.xml 2010-03-29 20:36:45 UTC (rev 12312) +++ modules/xml/trunk/core/pom.xml 2010-03-29 20:49:03 UTC (rev 12313) @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>seam-xml-parent</artifactId> + <artifactId>seam-xml-bean-config-parent</artifactId> <groupId>org.jboss.seam.xml</groupId> <version>3.0.0-SNAPSHOT</version> </parent> <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-core</artifactId> + <artifactId>seam-xml-bean-config</artifactId> <packaging>jar</packaging> - <name>Seam XML Extension Core</name> + <name>Seam XML Bean Config</name> <repositories> <repository> Modified: modules/xml/trunk/docs/pom.xml =================================================================== --- modules/xml/trunk/docs/pom.xml 2010-03-29 20:36:45 UTC (rev 12312) +++ modules/xml/trunk/docs/pom.xml 2010-03-29 20:49:03 UTC (rev 12313) @@ -4,11 +4,11 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>8</version> + <version>9</version> </parent> <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-reference-guide</artifactId> + <artifactId>seam-xml-bean-config-reference-guide</artifactId> <version>3.0.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>Seam XML Reference Guide</name> Modified: modules/xml/trunk/examples/princess-rescue/pom.xml =================================================================== --- modules/xml/trunk/examples/princess-rescue/pom.xml 2010-03-29 20:36:45 UTC (rev 12312) +++ modules/xml/trunk/examples/princess-rescue/pom.xml 2010-03-29 20:49:03 UTC (rev 12313) @@ -2,10 +2,10 @@ <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"> <parent> - <artifactId>seam-xml-parent</artifactId> + <artifactId>seam-xml-bean-config-parent</artifactId> <groupId>org.jboss.seam.xml</groupId> <version>3.0.0-SNAPSHOT</version> - <relativePath>../../parent/pom.xml</relativePath> + <relativePath>../../pom.xml</relativePath> </parent> @@ -43,7 +43,7 @@ <dependency> <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-core</artifactId> + <artifactId>seam-xml-bean-config</artifactId> <version>3.0.0-SNAPSHOT</version> </dependency> Modified: modules/xml/trunk/pom.xml =================================================================== --- modules/xml/trunk/pom.xml 2010-03-29 20:36:45 UTC (rev 12312) +++ modules/xml/trunk/pom.xml 2010-03-29 20:49:03 UTC (rev 12313) @@ -4,14 +4,14 @@ <parent> <artifactId>weld-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>8</version> + <version>9</version> </parent> <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-parent</artifactId> + <artifactId>seam-xml-bean-config-parent</artifactId> <packaging>pom</packaging> <version>3.0.0-SNAPSHOT</version> - <name>Seam XML Parent</name> + <name>Seam XML Bean Configuration Parent</name> <modules> <module>core</module>

14 years, 8 months

1
0
0 / 0

Seam SVN: r12312 - in modules/faces/trunk/src: main/java/org/jboss/seam/faces/context/conversation and 6 other directories.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-03-29 16:36:45 -0400 (Mon, 29 Mar 2010) New Revision: 12312 Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/util/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/util/Annotations.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/ modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationTestObject.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest-beans.xml Removed: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationBean.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest.java modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/End.java modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Log: @Begin and @End annotations are both functional - ConversationBoundary support alpha. Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/Begin.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -20,6 +20,7 @@ * * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> */ +@ConversationBoundary @InterceptorBinding @Target( { METHOD, TYPE }) @Retention(RUNTIME) Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -1,87 +0,0 @@ -/** - * - */ -package org.jboss.seam.faces.context.conversation; - -import java.io.Serializable; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; - -import javax.enterprise.context.Conversation; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; - -import org.slf4j.Logger; - -/** - * Intercepts methods annotated as Conversational entry points. - * - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - * - */ -@Begin -@Interceptor -// TODO try having @Begin and @End extend @ConversationAnno.. to converge into a -// single interceptor -public class BeginConversationInterceptor implements Serializable -{ - @Inject - Logger log; - - @Inject - Conversation conversation; - - @AroundInvoke - public Object before(final InvocationContext ctx) throws Exception - { - String cid = getConversationId(ctx.getMethod()); - if (cid != null) - { - conversation.begin(cid); - } - else - { - conversation.begin(); - } - - log.debug("Began conversation: (#0) on method: (#1.#2(...))", new Object[] { conversation.getId(), ctx.getMethod().getDeclaringClass().getName(), ctx.getMethod().getName() }); - - try - { - Object result = ctx.proceed(); - return result; - } - catch (Exception e) - { - conversation.end(); - throw e; - } - - } - - private String getConversationId(final Method m) - { - String result = null; - for (Annotation a : m.getAnnotations()) - { - if (a.annotationType().isAnnotationPresent(Begin.class)) - { - result = a.annotationType().getAnnotation(Begin.class).id(); - } - } - - if (result == null) - { - for (Annotation a : m.getDeclaringClass().getAnnotations()) - { - if (a.annotationType().isAnnotationPresent(Begin.class)) - { - result = a.annotationType().getAnnotation(Begin.class).id(); - } - } - } - return result; - } -} Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -1,34 +0,0 @@ -/** - * - */ -package org.jboss.seam.faces.context.conversation; - -import java.util.ArrayList; -import java.util.List; - -import javax.enterprise.event.Observes; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.BeforeBeanDiscovery; -import javax.enterprise.inject.spi.Extension; - -import org.jboss.weld.manager.BeanManagerImpl; - -/** - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - * - */ -public class ConversationAnnotationExtension implements Extension -{ - public void beforeBeanDiscovery(@Observes final BeforeBeanDiscovery event, final BeanManager manager) - { - if (manager instanceof BeanManagerImpl) - { - BeanManagerImpl impl = (BeanManagerImpl) manager; - - List<Class<?>> list = new ArrayList<Class<?>>(); - list.addAll(impl.getEnabledInterceptorClasses()); - list.add(BeginConversationInterceptor.class); - impl.setEnabledInterceptorClasses(list); - } - } -} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundary.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,24 @@ +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} + * + * @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/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java (from rev 12311, modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java) =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,108 @@ +/** + * + */ +package org.jboss.seam.faces.context.conversation; + +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + +import javax.enterprise.context.Conversation; +import javax.inject.Inject; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +import org.jboss.seam.faces.util.Annotations; +import org.slf4j.Logger; + +/** + * Intercepts methods annotated as Conversational entry points. + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + * + */ +@ConversationBoundary +@Interceptor +public class ConversationBoundaryInterceptor implements Serializable +{ + private static final long serialVersionUID = -2729227895205287477L; + + @Inject + Logger log; + + @Inject + Conversation conversation; + + @AroundInvoke + public Object before(final InvocationContext ctx) throws Exception + { + Object result = null; + if (Annotations.hasAnnotation(ctx.getMethod(), Begin.class)) + { + result = beginConversation(ctx); + } + + if (Annotations.hasAnnotation(ctx.getMethod(), End.class)) + { + endConversation(ctx); + } + + return result; + } + + private Object beginConversation(final InvocationContext ctx) throws Exception + { + String cid = getConversationId(ctx.getMethod()); + if (cid != null) + { + conversation.begin(cid); + } + else + { + conversation.begin(); + } + + log.debug("Began conversation: (#0) on method: (#1.#2(...))", new Object[] { conversation.getId(), ctx.getMethod().getDeclaringClass().getName(), ctx.getMethod().getName() }); + + try + { + Object result = ctx.proceed(); + return result; + } + catch (Exception e) + { + conversation.end(); + throw e; + } + } + + private void endConversation(final InvocationContext ctx) + { + conversation.end(); + } + + private String getConversationId(final Method m) + { + String result = null; + for (Annotation a : m.getAnnotations()) + { + if (a.annotationType().isAnnotationPresent(Begin.class)) + { + result = a.annotationType().getAnnotation(Begin.class).id(); + } + } + + if (result == null) + { + for (Annotation a : m.getDeclaringClass().getAnnotations()) + { + if (a.annotationType().isAnnotationPresent(Begin.class)) + { + result = a.annotationType().getAnnotation(Begin.class).id(); + } + } + } + return result; + } +} Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/End.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/End.java 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/End.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -20,6 +20,7 @@ * * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> */ +@ConversationBoundary @InterceptorBinding @Target( { METHOD, TYPE }) @Retention(RUNTIME) Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/util/Annotations.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/util/Annotations.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/util/Annotations.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,78 @@ +package org.jboss.seam.faces.util; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + +import javax.enterprise.inject.Stereotype; + +/** + * Utility class for common @{@link Annotation} operations. + * <p> + * TODO: This should probably go into weld-extensions so other portable + * extensions can leverage it. + * + * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a> + * + */ +public class Annotations +{ + /** + * Discover if a Method <b>m</b> has been annotated with <b>type</b>. This + * also discovers annotations defined through a @{@link Stereotype}. + * + * @return True if annotation is present either on the method itself, or on + * 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) + { + boolean result = false; + if (m.isAnnotationPresent(type)) + { + result = true; + } + else + { + for (Annotation a : m.getAnnotations()) + { + if (a.annotationType().isAnnotationPresent(type)) + { + result = true; + } + } + } + + if (result == false) + { + result = hasAnnotation(m.getDeclaringClass(), type); + } + return result; + } + + /** + * Discover if a Class <b>c</b> has been annotated with <b>type</b>. This + * also discovers annotations defined through a @{@link Stereotype}. + * + * @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) + { + boolean result = false; + if (c.isAnnotationPresent(type)) + { + result = true; + } + else + { + for (Annotation a : c.getAnnotations()) + { + if (a.annotationType().isAnnotationPresent(type)) + { + result = true; + } + } + } + return result; + } +} Modified: modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-03-29 20:36:45 UTC (rev 12312) @@ -1,3 +1,2 @@ org.jboss.seam.faces.context.ViewScopedExtension -org.jboss.seam.faces.context.FlashScopedExtension -org.jboss.seam.faces.context.conversation.ConversationAnnotationExtension \ No newline at end of file +org.jboss.seam.faces.context.FlashScopedExtension \ No newline at end of file Deleted: modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationBean.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationBean.java 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationBean.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -1,34 +0,0 @@ -/** - * - */ -package org.jboss.seam.faces.context.conversation; - -import javax.enterprise.context.Conversation; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; - -/** - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - * - */ -@RequestScoped -public class BeginConversationBean -{ - @Inject Conversation conversation; - - private boolean conversationLongRunningDuringInvocation = false; - - @Begin - public void beginConversation() - { - if (!conversation.isTransient()) - { - conversationLongRunningDuringInvocation = true; - } - } - - public boolean isConversationLongRunningInsideMethodCall() { - return conversationLongRunningDuringInvocation; - } - -} Deleted: modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest.java 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -1,54 +0,0 @@ -/** - * - */ -package org.jboss.seam.faces.context.conversation; - -import javax.enterprise.context.Conversation; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; - -import javax.inject.Inject; - -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.faces.MockConversation; -import org.jboss.seam.faces.MockLogger; -import org.jboss.shrinkwrap.api.ArchivePaths; -import org.jboss.shrinkwrap.api.Archives; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.junit.internal.runners.statements.Fail; -import org.junit.runner.RunWith; - -/** - * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> - * - */ -(a)RunWith(Arquillian.class) -public class BeginConversationInterceptorTest -{ - @Deployment - public static JavaArchive createTestArchive() - { - return Archives.create("test.jar", JavaArchive.class).addClasses(BeginConversationInterceptor.class, BeginConversationBean.class, MockLogger.class, MockConversation.class).addManifestResource(BeginConversationInterceptorTest.class.getPackage().getName().replaceAll("\\.", "/") + "/BeginConversationInterceptorTest-beans.xml", ArchivePaths.create("beans.xml")); - } - - @Inject Conversation conversation; - - @Inject private BeginConversationBean interceptedBean; - - @Test - //(a)Category(Fail.class) - public void testConversationStarted() - { - // assert fixtures - assertTrue(conversation.isTransient()); - assertFalse(interceptedBean.isConversationLongRunningInsideMethodCall()); - - interceptedBean.beginConversation(); - - assertFalse(conversation.isTransient()); - assertTrue(interceptedBean.isConversationLongRunningInsideMethodCall()); - } -} Copied: modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java (from rev 12311, modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest.java) =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,64 @@ +/** + * + */ +package org.jboss.seam.faces.context.conversation; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import javax.enterprise.context.Conversation; +import javax.inject.Inject; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.faces.MockConversation; +import org.jboss.seam.faces.MockLogger; +import org.jboss.shrinkwrap.api.ArchivePaths; +import org.jboss.shrinkwrap.api.Archives; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + * + */ +(a)RunWith(Arquillian.class) +public class ConversationBoundaryInterceptorTest +{ + @Deployment + public static JavaArchive createTestArchive() + { + return Archives.create("test.jar", JavaArchive.class).addClasses(ConversationBoundaryInterceptor.class, ConversationalBean.class, MockLogger.class, MockConversation.class).addManifestResource(ConversationBoundaryInterceptorTest.class.getPackage().getName().replaceAll("\\.", "/") + "/ConversationBoundaryInterceptorTest-beans.xml", ArchivePaths.create("beans.xml")); + } + + @Inject + Conversation conversation; + + @Inject + private ConversationalBean interceptedBean; + + @Test + public void testConversationStarted() + { + assertTrue(conversation.isTransient()); + assertFalse(interceptedBean.isConversationLongRunningInsideMethodCall()); + + interceptedBean.beginConversation(); + + assertFalse(conversation.isTransient()); + assertTrue(interceptedBean.isConversationLongRunningInsideMethodCall()); + } + + @Test + public void testConversationBeginsAndEnds() + { + assertTrue(conversation.isTransient()); + assertFalse(interceptedBean.isConversationLongRunningDuringInvocation2()); + + interceptedBean.beginAndEndConversation(); + + assertTrue(conversation.isTransient()); + assertTrue(interceptedBean.isConversationLongRunningDuringInvocation2()); + } +} Copied: modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java (from rev 12311, modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/BeginConversationBean.java) =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,55 @@ +/** + * + */ +package org.jboss.seam.faces.context.conversation; + +import javax.enterprise.context.Conversation; +import javax.enterprise.context.RequestScoped; +import javax.inject.Inject; + +/** + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + * + */ +@RequestScoped +public class ConversationalBean +{ + @Inject + Conversation conversation; + + private boolean conversationLongRunningDuringInvocation = false; + + private boolean conversationLongRunningDuringInvocation2; + + @Begin + public void beginConversation() + { + if (!conversation.isTransient()) + { + conversationLongRunningDuringInvocation = true; + } + } + + @Begin + @End + public void beginAndEndConversation() + { + conversationLongRunningDuringInvocation2 = true; + } + + public boolean isConversationLongRunningDuringInvocation2() + { + return conversationLongRunningDuringInvocation2; + } + + public void setConversationLongRunningDuringInvocation2(final boolean conversationLongRunningDuringInvocation2) + { + this.conversationLongRunningDuringInvocation2 = conversationLongRunningDuringInvocation2; + } + + public boolean isConversationLongRunningInsideMethodCall() + { + return conversationLongRunningDuringInvocation; + } + +} Added: modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationTestObject.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationTestObject.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationTestObject.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,19 @@ +package org.jboss.seam.faces.util; + +import org.jboss.seam.faces.context.conversation.Begin; +import org.jboss.seam.faces.context.conversation.End; + +@Begin +public class AnnotationTestObject +{ + + public void begin() + { + } + + @End + public void end() + { + } + +} Added: modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,46 @@ +package org.jboss.seam.faces.util; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.lang.reflect.Method; + +import org.jboss.seam.faces.context.conversation.Begin; +import org.jboss.seam.faces.context.conversation.End; +import org.junit.Test; + +/** + * + * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a> + * + */ +public class AnnotationsTest +{ + @Test + public void testHasAnnotationOnClassDirectly() throws Exception + { + Method begin = AnnotationTestObject.class.getMethod("begin", new Class[] {}); + + assertTrue(Annotations.hasAnnotation(begin, Begin.class)); + assertFalse(Annotations.hasAnnotation(begin, End.class)); + } + + @Test + public void testHasAnnotationOnMethodDirectly() throws Exception + { + Method end = AnnotationTestObject.class.getMethod("end", new Class[] {}); + + assertTrue(Annotations.hasAnnotation(end, End.class)); + } + + @Test + public void testHasAnnotationOnMethodIndirectlyFromClass() throws Exception + { + 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)); + } + +} Deleted: modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml =================================================================== --- modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml 2010-03-29 16:26:07 UTC (rev 12311) +++ modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml 2010-03-29 20:36:45 UTC (rev 12312) @@ -1,12 +0,0 @@ -<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> - - - -</beans> \ No newline at end of file Copied: modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest-beans.xml (from rev 12311, modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml) =================================================================== --- modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest-beans.xml (rev 0) +++ modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptorTest-beans.xml 2010-03-29 20:36:45 UTC (rev 12312) @@ -0,0 +1,10 @@ +<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> + + <interceptors> + <class>org.jboss.seam.faces.context.conversation.ConversationBoundaryInterceptor</class> + </interceptors> + +</beans> \ No newline at end of file

14 years, 8 months

1
0
0 / 0

Seam SVN: r12311 - in modules/faces/trunk/src: main/resources/META-INF and 2 other directories.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-03-29 12:26:07 -0400 (Mon, 29 Mar 2010) New Revision: 12311 Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java modules/faces/trunk/src/main/resources/META-INF/beans.xml modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml Log: Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java 2010-03-29 11:42:49 UTC (rev 12310) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/BeginConversationInterceptor.java 2010-03-29 16:26:07 UTC (rev 12311) @@ -23,6 +23,8 @@ */ @Begin @Interceptor +// TODO try having @Begin and @End extend @ConversationAnno.. to converge into a +// single interceptor public class BeginConversationInterceptor implements Serializable { @Inject Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/conversation/ConversationAnnotationExtension.java 2010-03-29 16:26:07 UTC (rev 12311) @@ -0,0 +1,34 @@ +/** + * + */ +package org.jboss.seam.faces.context.conversation; + +import java.util.ArrayList; +import java.util.List; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; + +import org.jboss.weld.manager.BeanManagerImpl; + +/** + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + * + */ +public class ConversationAnnotationExtension implements Extension +{ + public void beforeBeanDiscovery(@Observes final BeforeBeanDiscovery event, final BeanManager manager) + { + if (manager instanceof BeanManagerImpl) + { + BeanManagerImpl impl = (BeanManagerImpl) manager; + + List<Class<?>> list = new ArrayList<Class<?>>(); + list.addAll(impl.getEnabledInterceptorClasses()); + list.add(BeginConversationInterceptor.class); + impl.setEnabledInterceptorClasses(list); + } + } +} Modified: modules/faces/trunk/src/main/resources/META-INF/beans.xml =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/beans.xml 2010-03-29 11:42:49 UTC (rev 12310) +++ modules/faces/trunk/src/main/resources/META-INF/beans.xml 2010-03-29 16:26:07 UTC (rev 12311) @@ -2,9 +2,5 @@ xsi:schemaLocation=" http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> - - <interceptors> - <class>org.jboss.seam.faces.context.conversation.BeginConversationInterceptor</class> - </interceptors> - + </beans> \ No newline at end of file Modified: modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-03-29 11:42:49 UTC (rev 12310) +++ modules/faces/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-03-29 16:26:07 UTC (rev 12311) @@ -1,2 +1,3 @@ org.jboss.seam.faces.context.ViewScopedExtension -org.jboss.seam.faces.context.FlashScopedExtension \ No newline at end of file +org.jboss.seam.faces.context.FlashScopedExtension +org.jboss.seam.faces.context.conversation.ConversationAnnotationExtension \ No newline at end of file Modified: modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml =================================================================== --- modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml 2010-03-29 11:42:49 UTC (rev 12310) +++ modules/faces/trunk/src/test/resources/org/jboss/seam/faces/context/conversation/BeginConversationInterceptorTest-beans.xml 2010-03-29 16:26:07 UTC (rev 12311) @@ -3,8 +3,10 @@ http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> + </beans> \ No newline at end of file

14 years, 8 months

1
0
0 / 0

Seam SVN: r12310 - in modules/security/trunk: examples/seamspace/src/main/webapp and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-29 07:42:49 -0400 (Mon, 29 Mar 2010) New Revision: 12310 Modified: modules/security/trunk/core/src/main/java/org/jboss/seam/security/RememberMe.java modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml Log: fixed example home page Modified: modules/security/trunk/core/src/main/java/org/jboss/seam/security/RememberMe.java =================================================================== --- modules/security/trunk/core/src/main/java/org/jboss/seam/security/RememberMe.java 2010-03-29 10:26:43 UTC (rev 12309) +++ modules/security/trunk/core/src/main/java/org/jboss/seam/security/RememberMe.java 2010-03-29 11:42:49 UTC (rev 12310) @@ -248,6 +248,11 @@ return enabled; } + public void setEnabled(boolean enabled) + { + this.enabled = enabled; + } + /* public void setEnabled(boolean enabled) { Modified: modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml =================================================================== --- modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml 2010-03-29 10:26:43 UTC (rev 12309) +++ modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml 2010-03-29 11:42:49 UTC (rev 12310) @@ -55,7 +55,7 @@ <div class="loginRow"> <h:outputLabel for="rememberMe" value="Remember me" styleClass="loginLabel"/> - <h:selectBooleanCheckbox id="rememberMe" value="#{identity.rememberMe}"/> + <h:selectBooleanCheckbox id="rememberMe" value="#{rememberMe.enabled}"/> </div> <div class="buttons"> Modified: modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml =================================================================== --- modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml 2010-03-29 10:26:43 UTC (rev 12309) +++ modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml 2010-03-29 11:42:49 UTC (rev 12310) @@ -19,14 +19,14 @@ <div class="headerMenu"> <ui:fragment rendered="#{identity.loggedIn}"> - <s:link id="profile" view="/profile.xhtml" value="My Profile" propagation="none"> + <h:link id="profile" view="/profile.xhtml" value="My Profile" propagation="none"> <f:param name="name" value="#{authenticatedMember.memberName}"/> - </s:link> + </h:link> <h:outputText styleClass="divider" value=" | "/> </ui:fragment> - <ui:fragment rendered="#{s:hasRole('admin')}"> - <s:link id="security" view="/security.xhtml" value="Security" propagation="none"/> + <ui:fragment rendered="#{identity.hasRole('admin')}"> + <h:link id="security" view="/security.xhtml" value="Security" propagation="none"/> <h:outputText styleClass="divider" value=" | "/> </ui:fragment>

14 years, 8 months

1
0
0 / 0

Seam SVN: r12308 - in modules/security/trunk/examples/seamspace: src/main/java/org/jboss/seam/security/examples/seamspace/util and 2 other directories.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-29 05:08:48 -0400 (Mon, 29 Mar 2010) New Revision: 12308 Added: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/util/EntityManagerProducer.java modules/security/trunk/examples/seamspace/src/main/webapp/test.xhtml Modified: modules/security/trunk/examples/seamspace/pom.xml modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/faces-config.xml modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml Log: faces-config.xml is required after all, otherwise jsf pages won't render Modified: modules/security/trunk/examples/seamspace/pom.xml =================================================================== --- modules/security/trunk/examples/seamspace/pom.xml 2010-03-29 07:34:38 UTC (rev 12307) +++ modules/security/trunk/examples/seamspace/pom.xml 2010-03-29 09:08:48 UTC (rev 12308) @@ -30,6 +30,20 @@ </dependency> <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.2-FCS</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.0.GA</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.jboss.seam.security</groupId> <artifactId>seam-security-core</artifactId> <version>3.0.0-SNAPSHOT</version> @@ -61,14 +75,21 @@ <artifactId>servlet-api</artifactId> <version>2.5</version> <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <scope>runtime</scope> + <version>2.1.2-b04</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.2-FCS</version> - <scope>provided</scope> - </dependency> </dependencies> <build> Added: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/util/EntityManagerProducer.java =================================================================== --- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/util/EntityManagerProducer.java (rev 0) +++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/util/EntityManagerProducer.java 2010-03-29 09:08:48 UTC (rev 12308) @@ -0,0 +1,18 @@ +package org.jboss.seam.security.examples.seamspace.util; + +import java.io.Serializable; + +import javax.enterprise.context.ConversationScoped; +import javax.enterprise.inject.Produces; +import javax.persistence.EntityManager; + +@ConversationScoped +public class EntityManagerProducer implements Serializable +{ + private static final long serialVersionUID = 8654896806568473010L; + + public @Produces EntityManager getEntityManager() + { + return null; + } +} Modified: modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/faces-config.xml 2010-03-29 07:34:38 UTC (rev 12307) +++ modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/faces-config.xml 2010-03-29 09:08:48 UTC (rev 12308) @@ -1,7 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +<faces-config version="2.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> +  + </faces-config> Modified: modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml =================================================================== --- modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml 2010-03-29 07:34:38 UTC (rev 12307) +++ modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/web.xml 2010-03-29 09:08:48 UTC (rev 12308) @@ -2,7 +2,8 @@ <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <display-name>SeamSpace Example</display-name> @@ -19,14 +20,9 @@ <url-pattern>*.jsf</url-pattern> </servlet-mapping> - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> -  - <servlet> +  - <session-config> - <session-timeout>10</session-timeout> - </session-config> </web-app> Modified: modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml =================================================================== --- modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml 2010-03-29 07:34:38 UTC (rev 12307) +++ modules/security/trunk/examples/seamspace/src/main/webapp/home.xhtml 2010-03-29 09:08:48 UTC (rev 12308) @@ -1,93 +1,95 @@ <!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - template="/template.xhtml"> - - <ui:define name="content"> - <div id="contentMain"> - <h1>Welcome to seamspace!</h1> + xmlns:h="http://java.sun.com/jsf/html"> + + <ui:composition template="/template.xhtml"> - <p> - This example project is an imitation of a popular social networking site, and has - been put together to demonstrate the various features of the Seam Security API. - </p> - - <p><b>New!</b> You can now use the <h:link view="/hashgen.xhtml" value="Password Hash Generator"/> - page to generate password hashes for your own application. - </p> - - </div> - - <div id="contentDivider"> - </div> - - <div id="contentSide"> - <div class="advertising"></div> - - <h:form id="loginForm" rendered="#{not identity.loggedIn}"> - <div class="memberLogin"> - <div class="loginHeader">Member Login</div> + <ui:define name="content"> + <div id="contentMain"> + <h1>Welcome to seamspace!</h1> + + <p> + This example project is an imitation of a popular social networking site, and has + been put together to demonstrate the various features of the Seam Security API. + </p> + + <p><b>New!</b> You can now use the <h:link view="/hashgen.xhtml" value="Password Hash Generator"/> + page to generate password hashes for your own application. + </p> + + </div> + + <div id="contentDivider"> + </div> + + <div id="contentSide"> + <div class="advertising"></div> + + <h:form id="loginForm" rendered="#{not identity.loggedIn}"> + <div class="memberLogin"> + <div class="loginHeader">Member Login</div> + + <h:messages id="messages" globalOnly="true"/> + + <div class="loginRow"> + <h:outputLabel for="name" value="Member name" styleClass="loginLabel"/> + <h:inputText id="name" value="#{credentials.username}"/> + </div> + + <div class="validationMsg"> + <h:message for="name"/> + </div> + + <div class="loginRow"> + <h:outputLabel for="password" value="Password" styleClass="loginLabel"/> + <h:inputSecret id="password" value="#{credentials.password}" redisplay="true"/> + </div> + + <div class="validationMsg"> + <h:message for="password"/> + </div> + + <div class="loginRow"> + <h:outputLabel for="rememberMe" value="Remember me" styleClass="loginLabel"/> + <h:selectBooleanCheckbox id="rememberMe" value="#{identity.rememberMe}"/> + </div> + + <div class="buttons"> + <h:commandButton id="login" value="LOGIN" action="#{identity.login}" styleClass="loginButton"/> + <h:commandButton id="register" value="SIGN UP!" action="#{register.start}" styleClass="registerButton"/> + </div> + + <br class="clear"/> - <h:messages id="messages" globalOnly="true"/> - - <div class="loginRow"> - <h:outputLabel for="name" value="Member name" styleClass="loginLabel"/> - <h:inputText id="name" value="#{credentials.username}"/> </div> - <div class="validationMsg"> - <h:message for="name"/> - </div> + <span>Tip: You can log in using <b>demo/demo</b> as the username/password</span> + </h:form> + + <div class="newMembers"> + <div class="newMembersHeader">Cool new members</div> + + <ui:repeat value="#{newMembers}" var="newMember"> + <div class="newMember"> + + <h:link view="/profile.seam" propagation="none"> + <f:param name="name" value="#{newMember.memberName}"/> + #{newMember.memberName}<br/> + <h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&width=90"/> + </h:link> + + </div> + </ui:repeat> - <div class="loginRow"> - <h:outputLabel for="password" value="Password" styleClass="loginLabel"/> - <h:inputSecret id="password" value="#{credentials.password}" redisplay="true"/> - </div> - - <div class="validationMsg"> - <h:message for="password"/> - </div> - - <div class="loginRow"> - <h:outputLabel for="rememberMe" value="Remember me" styleClass="loginLabel"/> - <h:selectBooleanCheckbox id="rememberMe" value="#{identity.rememberMe}"/> - </div> - - <div class="buttons"> - <h:commandButton id="login" value="LOGIN" action="#{identity.login}" styleClass="loginButton"/> - <h:commandButton id="register" value="SIGN UP!" action="#{register.start}" styleClass="registerButton"/> - </div> - <br class="clear"/> - </div> - - <span>Tip: You can log in using <b>demo/demo</b> as the username/password</span> - </h:form> - - <div class="newMembers"> - <div class="newMembersHeader">Cool new members</div> - - <ui:repeat value="#{newMembers}" var="newMember"> - <div class="newMember"> - - <h:link view="/profile.seam" propagation="none"> - <f:param name="name" value="#{newMember.memberName}"/> - #{newMember.memberName}<br/> - <h:graphicImage value="/content/images?id=#{newMember.picture.imageId}&width=90"/> - </h:link> - - </div> - </ui:repeat> - - <br class="clear"/> </div> - </div> - - </ui:define> - -</ui:composition> + + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml =================================================================== --- modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml 2010-03-29 07:34:38 UTC (rev 12307) +++ modules/security/trunk/examples/seamspace/src/main/webapp/template.xhtml 2010-03-29 09:08:48 UTC (rev 12308) @@ -1,66 +1,65 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:s="http://jboss.com/products/seam/taglib" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>SeamSpace</title> - <link href="style/seamspace.css" rel="stylesheet" type="text/css"/> - <link href="style/date.css" rel="stylesheet" type="text/css"/> - <ui:insert name="head"/> -</head> - -<body> - - <div id="header"> - <div class="headerRight"> - <div class="headerMenu"> - - <s:fragment rendered="#{identity.loggedIn}"> - <s:link id="profile" view="/profile.xhtml" value="My Profile" propagation="none"> - <f:param name="name" value="#{authenticatedMember.memberName}"/> - </s:link> - <h:outputText styleClass="divider" value=" | "/> - </s:fragment> - - <s:fragment rendered="#{s:hasRole('admin')}"> - <s:link id="security" view="/security.xhtml" value="Security" propagation="none"/> - <h:outputText styleClass="divider" value=" | "/> - </s:fragment> - - <s:link id="logout" action="#{identity.logout}" value="Log out" rendered="#{identity.loggedIn}"/> - <h:outputLink id="login" value="home.seam" rendered="#{not identity.loggedIn}">Log in</h:outputLink> - </div> - <br style="clear:both"/> - <h:form> - <div> - <a href="#">SeamSpace</a><h:outputText styleClass="divider" value=" | "/> - <a href="#">People</a><h:outputText styleClass="divider" value=" | "/> - <a href="#">Music</a><h:outputText styleClass="divider" value=" | "/> - <a href="#">Blogs</a> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>SeamSpace</title> + <link href="style/seamspace.css" rel="stylesheet" type="text/css"/> + <link href="style/date.css" rel="stylesheet" type="text/css"/> + <ui:insert name="head"/> + </head> + + <body> + + <div id="header"> + <div class="headerRight"> + <div class="headerMenu"> + + <ui:fragment rendered="#{identity.loggedIn}"> + <s:link id="profile" view="/profile.xhtml" value="My Profile" propagation="none"> + <f:param name="name" value="#{authenticatedMember.memberName}"/> + </s:link> + <h:outputText styleClass="divider" value=" | "/> + </ui:fragment> + + <ui:fragment rendered="#{s:hasRole('admin')}"> + <s:link id="security" view="/security.xhtml" value="Security" propagation="none"/> + <h:outputText styleClass="divider" value=" | "/> + </ui:fragment> + + <h:link id="logout" action="#{identity.logout}" value="Log out" rendered="#{identity.loggedIn}"/> + <h:outputLink id="login" value="home.seam" rendered="#{not identity.loggedIn}">Log in</h:outputLink> </div> - <div id="search"> - <h:inputText type="text" styleClass="searchField"/> - <h:commandButton value="Search SeamSpace" onclick="javascript:alert('This feature coming soon!');return false" styleClass="searchButton"/> - </div> - </h:form> + <br style="clear:both"/> + <h:form> + <div> + <a href="#">SeamSpace</a><h:outputText styleClass="divider" value=" | "/> + <a href="#">People</a><h:outputText styleClass="divider" value=" | "/> + <a href="#">Music</a><h:outputText styleClass="divider" value=" | "/> + <a href="#">Blogs</a> + </div> + <div id="search"> + <h:inputText type="text" styleClass="searchField"/> + <h:commandButton value="Search SeamSpace" onclick="javascript:alert('This feature coming soon!');return false" styleClass="searchButton"/> + </div> + </h:form> + </div> </div> - </div> + + <div id="menubar"> + <h:link view="/home.xhtml" value="Home" propagation="none"/><h:outputText styleClass="divider" value=" | "/> + <h:link value="Browse" onclick="javascript:alert('This feature coming soon!');return false"/><h:outputText styleClass="divider" value=" | "/> + <h:link value="Blog" onclick="javascript:alert('This feature coming soon!');return false"/><h:outputText styleClass="divider" value=" | "/> + <h:link value="Music" onclick="javascript:alert('This feature coming soon!');return false"/> + </div> - <div id="menubar"> - <s:link view="/home.xhtml" value="Home" propagation="none"/><h:outputText styleClass="divider" value=" | "/> - <s:link value="Browse" onclick="javascript:alert('This feature coming soon!');return false"/><h:outputText styleClass="divider" value=" | "/> - <s:link value="Blog" onclick="javascript:alert('This feature coming soon!');return false"/><h:outputText styleClass="divider" value=" | "/> - <s:link value="Music" onclick="javascript:alert('This feature coming soon!');return false"/> - </div> - - <div id="content"> - <ui:insert name="content"/> - </div> - -</body> + <div id="content"> + <ui:insert name="content"/> + </div> + + </body> </html> Added: modules/security/trunk/examples/seamspace/src/main/webapp/test.xhtml =================================================================== --- modules/security/trunk/examples/seamspace/src/main/webapp/test.xhtml (rev 0) +++ modules/security/trunk/examples/seamspace/src/main/webapp/test.xhtml 2010-03-29 09:08:48 UTC (rev 12308) @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:head> + <title>Java EE 6 Starter Application</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + </h:head> + <h:body> + <h:outputLabel value="Hello World!"/> + </h:body> +</html> \ No newline at end of file

14 years, 8 months

1
0
0 / 0

Seam SVN: r12307 - tags.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-03-29 03:34:38 -0400 (Mon, 29 Mar 2010) New Revision: 12307 Added: tags/JBPAPP_4_2_CP09/ Log: tagged Seam 1.2.1.AP for coming EAP 4.2.9 and 4.3.8 CPs Copied: tags/JBPAPP_4_2_CP09 (from rev 12306, branches/enterprise/JBPAPP_4_2_CP01)

14 years, 8 months

1
0
0 / 0

Seam SVN: r12306 - in modules/drools/trunk: core and 1 other directories.

by seam-commits＠lists.jboss.org

Author: tsurdilovic Date: 2010-03-27 10:59:29 -0400 (Sat, 27 Mar 2010) New Revision: 12306 Modified: modules/drools/trunk/core/pom.xml modules/drools/trunk/docs/drools-reference.pdf modules/drools/trunk/pom.xml Log: added test dependencies to pom. Modified: modules/drools/trunk/core/pom.xml =================================================================== --- modules/drools/trunk/core/pom.xml 2010-03-27 01:27:39 UTC (rev 12305) +++ modules/drools/trunk/core/pom.xml 2010-03-27 14:59:29 UTC (rev 12306) @@ -1,68 +1,85 @@ -<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> +<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> - <groupId>org.jboss.seam.drools</groupId> - <artifactId>seam-drools-parent</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.jboss.seam.drools</groupId> + <artifactId>seam-drools-parent</artifactId> + <version>3.0.0-SNAPSHOT</version> + </parent> - <groupId>org.jboss.seam.drools</groupId> - <artifactId>seam-drools-core</artifactId> - <version>3.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Seam Drools Core</name> - - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-api</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-templates</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-decisiontables</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-workitems</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> - </plugin> - </plugins> - </build> + <groupId>org.jboss.seam.drools</groupId> + <artifactId>seam-drools-core</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Seam Drools Core</name> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-compiler</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-api</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-templates</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-decisiontables</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-workitems</artifactId> + </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.6.1</version> + </plugin> + </plugins> + </build> + </project> Modified: modules/drools/trunk/docs/drools-reference.pdf =================================================================== (Binary files differ) Modified: modules/drools/trunk/pom.xml =================================================================== --- modules/drools/trunk/pom.xml 2010-03-27 01:27:39 UTC (rev 12305) +++ modules/drools/trunk/pom.xml 2010-03-27 14:59:29 UTC (rev 12306) @@ -20,6 +20,24 @@  </modules> + <developers> + <developer> + <name>Tihomir Surdilovic</name> + <email>tsurdilo(a)redhat.com</email> + <url>http://in.relation.to/Bloggers/Tihomir</url> + <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> + </properties> + <build> <plugins> <plugin> @@ -87,6 +105,22 @@ <artifactId>drools-workitems</artifactId> <version>5.1.0.M1</version> </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <version>${arquillian.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <version>${arquillian.version}</version> + </dependency> </dependencies> </dependencyManagement>

14 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits March 2010