Seam SVN: r12520 - in modules/faces/trunk: impl/src/main/java/org/jboss/seam/faces/event and 1 other directories.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-04-16 17:52:00 -0400 (Fri, 16 Apr 2010)
New Revision: 12520
Added:
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/View.java
Modified:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java
Log:
@View
Added: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/View.java
===================================================================
--- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/View.java (rev 0)
+++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/View.java 2010-04-16 21:52:00 UTC (rev 12520)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.faces.event.qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * Qualifies observer method parameters to select events for a particular JSF view
+ *
+ * @author Nicklas Karlsson
+ */
+@Qualifier
+@Target( { FIELD, PARAMETER })
+@Retention(RUNTIME)
+public @interface View
+{
+ String value() default "";
+}
\ No newline at end of file
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-16 21:16:14 UTC (rev 12519)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-16 21:52:00 UTC (rev 12520)
@@ -21,17 +21,24 @@
*/
package org.jboss.seam.faces.event;
+import java.lang.annotation.Annotation;
+
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.util.AnnotationLiteral;
+import javax.faces.component.UIViewRoot;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ComponentSystemEvent;
import javax.faces.event.PostConstructApplicationEvent;
+import javax.faces.event.PostConstructViewMapEvent;
+import javax.faces.event.PreDestroyViewMapEvent;
+import javax.faces.event.PreRenderViewEvent;
import javax.faces.event.SystemEvent;
import javax.faces.event.SystemEventListener;
import org.jboss.seam.faces.cdi.BeanManagerAware;
import org.jboss.seam.faces.event.qualifier.Component;
+import org.jboss.seam.faces.event.qualifier.View;
/**
* A SystemEventListener used to bridge JSF system events to the CDI event
@@ -68,18 +75,33 @@
public void processEvent(final SystemEvent e) throws AbortProcessingException
{
Object payload = e.getClass().cast(e);
- if (e instanceof ComponentSystemEvent)
+ Annotation[] qualifiers = getQualifiers(e);
+ getBeanManager().fireEvent(payload, qualifiers);
+ }
+
+ private Annotation[] getQualifiers(SystemEvent e)
+ {
+ if (isViewEvent(e))
{
- ComponentSystemEvent ce = (ComponentSystemEvent) e;
- String id = ce.getComponent().getId();
- getBeanManager().fireEvent(e, new ComponentLiteral(id));
+ String id = ((UIViewRoot) e.getSource()).getViewId();
+ return new Annotation[] { new ViewLiteral(id) };
}
+ else if (e instanceof ComponentSystemEvent)
+ {
+ String id = ((ComponentSystemEvent) e).getComponent().getId();
+ return new Annotation[] { new ComponentLiteral(id) };
+ }
else
{
- getBeanManager().fireEvent(payload);
+ return new Annotation[] {};
}
}
+ private boolean isViewEvent(SystemEvent e)
+ {
+ return (e instanceof PreRenderViewEvent) || (e instanceof PostConstructViewMapEvent) || (e instanceof PreDestroyViewMapEvent);
+ }
+
private class ComponentLiteral extends AnnotationLiteral<Component> implements Component
{
private final String value;
@@ -93,6 +115,21 @@
{
this.value = value;
}
- }
+ }
+ private class ViewLiteral extends AnnotationLiteral<View> implements View
+ {
+ private final String value;
+
+ public String value()
+ {
+ return value;
+ }
+
+ public ViewLiteral(String value)
+ {
+ this.value = value;
+ }
+ }
+
}
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-16 21:16:14 UTC (rev 12519)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-16 21:52:00 UTC (rev 12520)
@@ -83,10 +83,12 @@
private final ScopeContext scopeContext = new ScopeContext("foo", new HashMap<String, Object>());
private final ExceptionQueuedEventContext eventContext = new ExceptionQueuedEventContext(facesContext, new NullPointerException());
private static final UIComponent component = new UIOutput();
+ private static final UIViewRoot uiViewRoot = new UIViewRoot();
static
{
component.setId("foo");
+ uiViewRoot.setViewId("foo.xhtml");
}
@Test
@@ -170,8 +172,14 @@
@Test
public void testObservePostConstructViewMap()
{
- fireAndAssert("14", new PostConstructViewMapEvent(new UIViewRoot()));
+ fireAndAssert("14", new PostConstructViewMapEvent(uiViewRoot));
}
+
+ @Test
+ public void testObservePostConstructSpecificViewMap()
+ {
+ fireAndAssert("14a", new PostConstructViewMapEvent(uiViewRoot));
+ }
@Test
public void testObservePostRestoreState()
@@ -188,10 +196,16 @@
@Test
public void testObservePreDestroyViewMap()
{
- fireAndAssert("17", new PreDestroyViewMapEvent(new UIViewRoot()));
+ fireAndAssert("17", new PreDestroyViewMapEvent(uiViewRoot));
}
@Test
+ public void testObservePreDestroySpecificViewMap()
+ {
+ fireAndAssert("17a", new PreDestroyViewMapEvent(uiViewRoot));
+ }
+
+ @Test
public void testObservePreRemoveFromView()
{
fireAndAssert("18", new PreRemoveFromViewEvent(component));
@@ -218,10 +232,16 @@
@Test
public void testObservePreRenderView()
{
- fireAndAssert("22", new PreRenderViewEvent(new UIViewRoot()));
+ fireAndAssert("22", new PreRenderViewEvent(uiViewRoot));
}
+ @Test
+ public void testObservePreRenderSpecificView()
+ {
+ fireAndAssert("23", new PreRenderViewEvent(uiViewRoot));
+ }
+
private void fireAndAssert(String caseId, SystemEvent... events)
{
observer.reset();
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-16 21:16:14 UTC (rev 12519)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-16 21:52:00 UTC (rev 12520)
@@ -47,6 +47,7 @@
import javax.faces.event.SystemEvent;
import org.jboss.seam.faces.event.qualifier.Component;
+import org.jboss.seam.faces.event.qualifier.View;
/**
*
@@ -146,11 +147,16 @@
recordObservation("13", e);
}
- public void observe2(@Observes PostConstructViewMapEvent e)
+ public void observe(@Observes PostConstructViewMapEvent e)
{
recordObservation("14", e);
+ }
+
+ public void observe2(@Observes @View("foo.xhtml") PostConstructViewMapEvent e)
+ {
+ recordObservation("14a", e);
}
-
+
public void observe(@Observes PostRestoreStateEvent e)
{
recordObservation("15", e);
@@ -161,11 +167,16 @@
recordObservation("16", e);
}
- public void observe2(@Observes PreDestroyViewMapEvent e)
+ public void observe(@Observes PreDestroyViewMapEvent e)
{
recordObservation("17", e);
}
+ public void observe2(@Observes @View("foo.xhtml") PreDestroyViewMapEvent e)
+ {
+ recordObservation("17a", e);
+ }
+
public void observe(@Observes PreRemoveFromViewEvent e)
{
recordObservation("18", e);
@@ -190,4 +201,9 @@
{
recordObservation("22", e);
}
+
+ public void observe2(@Observes @View("foo.xhtml") PreRenderViewEvent e)
+ {
+ recordObservation("23", e);
+ }
}
16 years
- 1
- 0
Seam SVN: r12519 - modules/faces/trunk/docs/reference/src/main/docbook/en-US.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-16 17:16:14 -0400 (Fri, 16 Apr 2010)
New Revision: 12519
Modified:
modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml
Log:
updated wording
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml 2010-04-16 21:12:33 UTC (rev 12518)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml 2010-04-16 21:16:14 UTC (rev 12519)
@@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
<chapter id="components">
- <title>Faces View Components</title>
+ <title>Seam Faces Components</title>
<para>
Mission statement for Faces Module components. Explain that they are functional, not UI-oriented.
</para>
16 years
- 1
- 0
Seam SVN: r12518 - modules/faces/trunk/docs/reference/src/main/docbook/en-US.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-16 17:12:33 -0400 (Fri, 16 Apr 2010)
New Revision: 12518
Modified:
modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml
Log:
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml 2010-04-16 21:09:02 UTC (rev 12517)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml 2010-04-16 21:12:33 UTC (rev 12518)
@@ -28,6 +28,12 @@
}</programlisting></entry>
</row>
<row>
+ <entry>javax.faces.context.ExternalContext</entry>
+ <entry><programlisting>public class Bean {
+ @Inject ExternalContext context;
+}</programlisting></entry>
+ </row>
+ <row>
<entry>javax.faces.application.NavigationHandler</entry>
<entry><programlisting>public class Bean {
@Inject NavigationHandler handler;
16 years
- 1
- 0
Seam SVN: r12517 - in modules/faces/trunk: docs/reference and 7 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-16 17:09:02 -0400 (Fri, 16 Apr 2010)
New Revision: 12517
Added:
modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml
Modified:
modules/faces/trunk/docs/reference/
modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml
modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml
modules/faces/trunk/examples/short-ly/pom.xml
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java
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/util/AnnotationsTest.java
modules/faces/trunk/pom.xml
Log:
* Updated reference doc.
* Added strong warning to BeanManagerAware
* Updated POM to remove dependency on GlassFish repo (one more remains)
* Renamed Annotations utility methods
Property changes on: modules/faces/trunk/docs/reference
___________________________________________________________________
Name: svn:ignore
+ target
.settings
.classpath
.project
Added: modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml (rev 0)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/artifacts.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<chapter id="artifacts">
+ <title>Faces Artifact Injection</title>
+ <para>
+ When creating CDI managed beans for use in the Web/UI layer, it is often necessary to access the FacesContext, NavigationHandler, and other
+ artifacts of the JSF environment. Seam Faces provides producers to allow injection of these artifacts in the proper scopes, enabling mock-testing
+ and other situations where the artifact may be difficult or tedious to resolve.
+ </para>
+ <para>
+ This is the full list of inject-able artifacts provided through Seam Faces.
+ <informaltable>
+ <tgroup cols="2">
+ <colspec colnum="1" colwidth="2*" />
+ <colspec colnum="2" colwidth="3*" />
+ <thead>
+ <row>
+ <entry>Artifact Class</entry>
+ <entry>Example</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>javax.faces.context.FacesContext</entry>
+ <entry><programlisting>public class Bean {
+ @Inject FacesContext context;
+}</programlisting></entry>
+ </row>
+ <row>
+ <entry>javax.faces.application.NavigationHandler</entry>
+ <entry><programlisting>public class Bean {
+ @Inject NavigationHandler handler;
+}</programlisting></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+</chapter>
\ No newline at end of file
Added: modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml (rev 0)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/components.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<chapter id="components">
+ <title>Faces View Components</title>
+ <para>
+ Mission statement for Faces Module components. Explain that they are functional, not UI-oriented.
+ </para>
+ <section id="viewaction">
+ <title><s:viewAction></title>
+ <para>
+ ViewAction doc
+ <programlisting><![CDATA[<s:viewAction> example]]></programlisting>
+ <tip>
+ <para>
+ Maybe a tip here?
+ </para>
+ </tip>
+ </para>
+ </section>
+</chapter>
\ No newline at end of file
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -2,29 +2,15 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
<chapter id="events">
- <title>JSF event propagation</title>
+ <title>Faces Events Propagation</title>
<para>
- By including the seam-faces module in your web application you will also have the
- JSF events propagated to the CDI event bridge so you can observe them in your beans.
- The event bridge works by installing JSF listeners at appropriate extension points and
- firing events on the BeanManager with associated qualifiers, passing along the event object.
- There are two categories of events, JSF phase events and JSF system events.
+ When the seam-faces module is installed in a web application, JSF events will automatically be propagated
+ via the CDI event-bridge, enabling managed beans to easily observe all Faces events.
</para>
-
- <section id="events.installation">
- <title>Installation</title>
- <para>
- The event bridges are installed automatically by including the seam-faces.jar and seam-faces-api.jar
- in the web application library folder. If you are using Maven as your build tool, you can add the
- following dependency:
- </para>
- <programlisting role="XML"><![CDATA[
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>seam-faces</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>]]></programlisting>
- </section>
+ <para>
+ There are two categories of events: JSF phase events, and JSF system events. Phase events are triggered
+ as JSF processes HTTP requests, while system events are raised at specific events during the JSF lifecycle.
+ </para>
<section id="events.phases">
<title>JSF phases events</title>
<para>
@@ -51,11 +37,10 @@
you would like to observe the full spectrum of events propagated you would write the following method in your
observer bean
<programlisting role="Java">
- public void observeAll(@Observes PhaseEvent e)
- {
- // Do something with the event object
- }
- </programlisting>
+public void observeAll(@Observes PhaseEvent e)
+{
+ // Do something with the event object
+} </programlisting>
</para>
<para>
Since the example above flushes you with a lot of events you have to sort out yourself, you might want to
@@ -65,35 +50,32 @@
<literal>@After</literal>. In order to split out the events into these categories, you would write two
observer methods like
<programlisting role="Java">
- public void observeBefore(@Observes @Before PhaseEvent e)
- {
- // Do something with the "before" event object
- }
-
- public void observeAfter(@Observes @After PhaseEvent e)
- {
- // Do something with the "after" event object
- }
- </programlisting>
+public void observeBefore(@Observes @Before PhaseEvent e)
+{
+ // Do something with the "before" event object
+}
+
+public void observeAfter(@Observes @After PhaseEvent e)
+{
+ // Do something with the "after" event object
+} </programlisting>
</para>
<para>
If you are interested in both the "before" and "after" event of a particular phase, you can limit them
by adding a lifecycle qualifer that corresponds to the phase:
<programlisting role="Java">
- public void observeRenderResponse(@Observes @RenderResponse PhaseEvent e)
- {
- // Do something with the "render response" event object
- }
- </programlisting>
+public void observeRenderResponse(@Observes @RenderResponse PhaseEvent e)
+{
+ // Do something with the "render response" event object
+} </programlisting>
</para>
<para>
By combining a temporal qualifier with a lifecycel one you can achieve the tightest qualification:
<programlisting role="Java">
- public void observeBeforeRenderResponse(@Observes @Before @RenderResponse PhaseEvent e)
- {
- // Do something with the "before render response" event object
- }
- </programlisting>
+public void observeBeforeRenderResponse(@Observes @Before @RenderResponse PhaseEvent e)
+{
+ // Do something with the "before render response" event object
+} </programlisting>
</para>
<para>
This is the full list of temporal and lifecycle qualifers
@@ -266,18 +248,16 @@
view-centric component events <literal>PreRenderViewEvent</literal>, <literal>PostConstructViewMapEvent</literal> and
<literal>PreDestroyViewMapEvent</literal> do not fire with the <literal>@Component</literal> qualifier.
<programlisting role="Java">
- public void observePrePasswordValidation(@Observes @Component("form:password") PreValidateEvent e)
- {
- // Do something with the "before password is validated" event object
- }
- </programlisting>
+public void observePrePasswordValidation(@Observes @Component("form:password") PreValidateEvent e)
+{
+ // Do something with the "before password is validated" event object
+} </programlisting>
Global system events are observer without the component qualifier
<programlisting role="Java">
- public void observeApplicationConstructed(@Observes PostConstructApplicationEvent e)
- {
- // Do something with the "after application is constructed" event object
- }
- </programlisting>
+public void observeApplicationConstructed(@Observes PostConstructApplicationEvent e)
+{
+ // Do something with the "after application is constructed" event object
+} </programlisting>
The name of the observing method is insignificant.
</para>
</section>
Added: modules/faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml (rev 0)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/installation.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<chapter id="installation">
+ <title>Installation</title>
+ <para>
+ Most features of Seam Faces are installed automatically by including the seam-faces.jar and seam-faces-api.jar
+ in the web application library folder. If you are using <ulink url="http://maven.apache.org/">Maven</ulink> as your build tool, you can add the
+ following dependency to your pom.xml file:
+ </para>
+ <programlisting role="XML"><![CDATA[<dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-faces</artifactId>
+ <version>${seam-faces-version}</version>
+</dependency>]]></programlisting>
+ <tip>
+ <para>Replace ${seam-faces-version} with the most recent or appropriate version of Seam Faces.</para>
+ </tip>
+ <section id="configuration">
+ <title>Configuration</title>
+ <para>
+ Some features of Seam Faces are not automatically configured, such as enhanced conversation support through annotations.
+ These features must be enabled in your web-application's WEB-INF/beans.xml file. There are two types of features:
+ Interceptors and Decorators. The process described here will be similar for other Seam Modules as well.
+ </para>
+ <programlisting role="XML"><![CDATA[<beans>
+ <interceptors>
+ <class>org.jboss.seam.faces.{package}.{Interceptor}</class>
+ </interceptors>
+ <decorators>
+ <class>org.jboss.seam.faces.{package}.{Decorator}</class>
+ </decorators>
+</beans>]]></programlisting>
+ <para>
+ Use the table below to configure
+ </para>
+ <para>
+ <informaltable>
+ <tgroup cols="3">
+ <colspec colnum="1" colwidth="1*" />
+ <colspec colnum="2" colwidth="1*" />
+ <colspec colnum="3" colwidth="3*" />
+ <thead>
+ <row>
+ <entry>Feature</entry>
+ <entry>Type</entry>
+ <entry>Class</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>Conversation Support</entry>
+ <entry>interceptor</entry>
+ <entry>org.jboss.seam.faces.context.conversation.ConversationBoundaryInterceptor</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </para>
+ </section>
+</chapter>
\ No newline at end of file
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -8,7 +8,11 @@
<toc />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="preface.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installation.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="events.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="scopes.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="artifacts.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="components.xml" />
<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapterXX.xml" />
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/preface.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -2,8 +2,11 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
<preface>
- <title>Preface: lorem ipsum</title>
+ <title>Introduction</title>
<para>
+ The goal of Seam Faces is to provide a fully integrated CDI programming model to the JavaServer Faces (JSF) 2.0
+ web-framework. With features such as observing Events, providing injection support for life-cycle artifacts
+ (FacesContext, NavigationHandler,) and more.
</para>
<!--
Added: modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml (rev 0)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/scopes.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<chapter id="scopes">
+ <title>Faces Scoping Support</title>
+ <para>
+ JSF 2.0 introduced the concept of the @ViewScope, and the @FlashScope; however, CDI does not support the non-standard
+ ViewScope by default, and JSF 2.0 did not provide annotations for accessing the FlashScope. The Seam Faces module
+ does both.
+ </para>
+ <section id="viewscoped">
+ <title>@ViewScope</title>
+ <para>
+ To scope a bean to the View, use the <literal>@javax.faces.bean.ViewScoped</literal> annotation. This means that your bean will be stored in the
+ <literal>javax.faces.component.UIViewRoot</literal> object associated with the view in which it was accessed. Each JSF view (faces-page) will store
+ its own instance of the bean, just like each HttpServletRequest has its own instance of a @RequestScoped bean.
+ <programlisting>@ViewScoped
+public class Bean {
+ // ...
+}</programlisting>
+ <caution>
+ <para>
+ @ViewScoped beans are destroyed when the JSF UIViewRoot object is destroyed. This means that the
+ life-span of @ViewScoped beans is dependent on the <literal>javax.faces.STATE_SAVING_METHOD</literal> employed by the application itself.
+ </para>
+ </caution>
+ </para>
+ </section>
+ <section id="flashscoped">
+ <title>@FlashScope</title>
+ <para>
+ To scope a bean to the Flash, use the <literal>@javax.faces.bean.FlashScoped</literal> annotation. This means that your bean will be stored in the
+ <literal>javax.faces.context.Flash</literal>; however, the Flash is independent of the JSF view, and independent of the Request object. Objects stored in the
+ Flash will survive one page request, then be destroyed after processing of the next subsequent request. As such, the Flash scope
+ can be thought of as a scope that spans two requests; objects are added to the Flash during the first request, then removed from
+ the Flash and destroyed after the second request.
+ <programlisting>@FlashScoped
+public class Bean {
+ // ...
+}</programlisting>
+ <caution>
+ <para>
+ @FlashScoped beans are destroyed when the Flash is cleared. This means that the
+ life-span of @FlashScoped beans is limited to two HTTP requests.
+ </para>
+ </caution>
+ </para>
+ </section>
+</chapter>
\ No newline at end of file
Modified: modules/faces/trunk/examples/short-ly/pom.xml
===================================================================
--- modules/faces/trunk/examples/short-ly/pom.xml 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/examples/short-ly/pom.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.seam.faces</groupId>
- <artifactId>faces-examples-short-ly</artifactId>
+ <artifactId>seam-faces-examples-short-ly</artifactId>
<packaging>war</packaging>
<version>0.0.1-SNAPSHOT</version>
- <name>bit.ly clone with Seam & PrettyFaces</name>
+ <name>Seam Faces Example bit.ly clone with PrettyFaces</name>
<url>http://seamframework.org</url>
@@ -17,10 +17,15 @@
<name>Repository hosting the jee6 artifacts</name>
<url>http://download.java.net/maven/2</url>
</repository>
+ <repository>
+ <id>JBoss.ORG</id>
+ <name>JBoss Maven Repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ </repository>
</repositories>
<properties>
- <hibernate.version>3.5.0-Final</hibernate.version>
+ <hibernate.version>3.5.1-Final</hibernate.version>
</properties>
<dependencies>
@@ -126,7 +131,7 @@
</configuration>
</plugin>
</plugins>
- <finalName>tiny.url</finalName>
+ <finalName>short.ly</finalName>
</build>
</project>
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/impl/pom.xml 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/impl/pom.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -33,17 +33,14 @@
<dependencies>
<dependency>
- <!-- Required until the Servlet 3.0 API can be resolved in Central -->
- <groupId>org.glassfish</groupId>
- <artifactId>javax.servlet</artifactId>
- <version>3.0</version>
- <scope>compile</scope>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<artifactId>seam-faces-api</artifactId>
<groupId>org.jboss.seam.faces</groupId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>compile</scope>
</dependency>
</dependencies>
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/cdi/BeanManagerAware.java 2010-04-16 21:09:02 UTC (rev 12517)
@@ -25,10 +25,18 @@
import java.util.List;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
import javax.inject.Inject;
/**
- * Super-class for listeners that need a reference to the BeanManager
+ * Super-class for non-CDI-native components that need a reference to the
+ * {@link BeanManager}
+ * <p>
+ * <b>**WARNING**</b> This class is <b>NEVER</b> safe to use outside of specific
+ * seam-faces implementation classes, and should be <b>avoided at all costs</b>.
+ * If you need a handle to the {@link BeanManager} you should probably register
+ * an {@link Extension} instead of using this class; have you tried using @
+ * {@link Inject}?
*
* @author Nicklas Karlsson
*/
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-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java 2010-04-16 21:09:02 UTC (rev 12517)
@@ -60,14 +60,14 @@
try
{
- if (Annotations.has(ctx.getMethod(), Begin.class))
+ if (Annotations.isAnnotationPresent(ctx.getMethod(), Begin.class))
{
beginConversation(ctx);
}
result = ctx.proceed();
- if (Annotations.has(ctx.getMethod(), End.class))
+ if (Annotations.isAnnotationPresent(ctx.getMethod(), End.class))
{
endConversation(ctx);
}
@@ -84,7 +84,7 @@
private void handleExceptionBegin(final InvocationContext ctx, final Exception e)
{
- if (Annotations.has(ctx.getMethod(), Begin.class))
+ if (Annotations.isAnnotationPresent(ctx.getMethod(), Begin.class))
{
List<? extends Class<? extends Exception>> typesPermittedByBegin = getPermittedExceptionTypesBegin(ctx.getMethod());
for (Class<? extends Exception> type : typesPermittedByBegin)
@@ -101,7 +101,7 @@
private void handleExceptionEnd(final InvocationContext ctx, final Exception e)
{
- if (Annotations.has(ctx.getMethod(), End.class))
+ if (Annotations.isAnnotationPresent(ctx.getMethod(), End.class))
{
List<? extends Class<? extends Exception>> typesPermittedByEnd = getPermittedExceptionTypesEnd(ctx.getMethod());
boolean permitted = false;
@@ -122,7 +122,7 @@
private void beginConversation(final InvocationContext ctx) throws Exception
{
- String cid = Annotations.get(ctx.getMethod(), Begin.class).id();
+ String cid = Annotations.getAnnotation(ctx.getMethod(), Begin.class).id();
if ((cid != null) && !"".equals(cid))
{
conversation.begin(cid);
@@ -132,7 +132,7 @@
conversation.begin();
}
- long timeout = Annotations.get(ctx.getMethod(), Begin.class).timeout();
+ long timeout = Annotations.getAnnotation(ctx.getMethod(), Begin.class).timeout();
if (timeout != -1)
{
conversation.setTimeout(timeout);
@@ -149,11 +149,11 @@
private List<? extends Class<? extends Exception>> getPermittedExceptionTypesBegin(final Method m)
{
- return Arrays.asList(Annotations.get(m, Begin.class).permit());
+ return Arrays.asList(Annotations.getAnnotation(m, Begin.class).permit());
}
private List<? extends Class<? extends Exception>> getPermittedExceptionTypesEnd(final Method m)
{
- return Arrays.asList(Annotations.get(m, End.class).permit());
+ return Arrays.asList(Annotations.getAnnotation(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-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/util/Annotations.java 2010-04-16 21:09:02 UTC (rev 12517)
@@ -48,7 +48,7 @@
* the declaring class of the method. Returns false if the annotation
* is not present.
*/
- public static boolean has(final Method m, final Class<? extends Annotation> type)
+ public static boolean isAnnotationPresent(final Method m, final Class<? extends Annotation> type)
{
boolean result = false;
if (m.isAnnotationPresent(type))
@@ -68,7 +68,7 @@
if (result == false)
{
- result = has(m.getDeclaringClass(), type);
+ result = isAnnotationPresent(m.getDeclaringClass(), type);
}
return result;
}
@@ -83,7 +83,7 @@
* @return True if annotation is present either on class, false if the
* annotation is not present.
*/
- public static boolean has(final Class<?> c, final Class<? extends Annotation> type)
+ public static boolean isAnnotationPresent(final Class<?> c, final Class<? extends Annotation> type)
{
boolean result = false;
if (c.isAnnotationPresent(type))
@@ -113,7 +113,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 get(final Method m, final Class<A> type)
+ public static <A extends Annotation> A getAnnotation(final Method m, final Class<A> type)
{
A result = m.getAnnotation(type);
if (result == null)
@@ -128,7 +128,7 @@
}
if (result == null)
{
- result = get(m.getDeclaringClass(), type);
+ result = getAnnotation(m.getDeclaringClass(), type);
}
return result;
}
@@ -143,7 +143,7 @@
* @return The annotation instance found on this class, or null if no
* matching annotation was found.
*/
- public static <A extends Annotation> A get(final Class<?> c, final Class<A> type)
+ public static <A extends Annotation> A getAnnotation(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/util/AnnotationsTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/util/AnnotationsTest.java 2010-04-16 21:09:02 UTC (rev 12517)
@@ -42,8 +42,8 @@
{
Method begin = AnnotationTestObject.class.getMethod("begin", new Class[] {});
- assertTrue(Annotations.has(begin, Begin.class));
- assertFalse(Annotations.has(begin, End.class));
+ assertTrue(Annotations.isAnnotationPresent(begin, Begin.class));
+ assertFalse(Annotations.isAnnotationPresent(begin, End.class));
}
@Test
@@ -51,7 +51,7 @@
{
Method end = AnnotationTestObject.class.getMethod("end", new Class[] {});
- assertTrue(Annotations.has(end, End.class));
+ assertTrue(Annotations.isAnnotationPresent(end, End.class));
}
@Test
@@ -60,14 +60,14 @@
Method begin = AnnotationTestObject.class.getMethod("begin", new Class[] {});
Method end = AnnotationTestObject.class.getMethod("end", new Class[] {});
- assertTrue(Annotations.has(begin, Begin.class));
- assertTrue(Annotations.has(end, Begin.class));
+ assertTrue(Annotations.isAnnotationPresent(begin, Begin.class));
+ assertTrue(Annotations.isAnnotationPresent(end, Begin.class));
}
public void testGetAnnotationOnMethodDirectly() throws Exception
{
Method end = AnnotationTestObject.class.getMethod("end", new Class[] {});
- End anno = Annotations.get(end, End.class);
+ End anno = Annotations.getAnnotation(end, End.class);
assertTrue(anno instanceof End);
}
@@ -75,7 +75,7 @@
public void testGetAnnotationOnMethodIndirectlyFromClass() throws Exception
{
Method end = AnnotationTestObject.class.getMethod("begin", new Class[] {});
- Begin anno = Annotations.get(end, Begin.class);
+ Begin anno = Annotations.getAnnotation(end, Begin.class);
assertTrue(anno instanceof Begin);
}
Modified: modules/faces/trunk/pom.xml
===================================================================
--- modules/faces/trunk/pom.xml 2010-04-16 18:20:53 UTC (rev 12516)
+++ modules/faces/trunk/pom.xml 2010-04-16 21:09:02 UTC (rev 12517)
@@ -24,8 +24,8 @@
<modules>
<module>api</module>
<module>impl</module>
- <!-- <module>docs</module>
- <module>examples</module> -->
+ <module>docs/reference</module>
+ <module>examples/short-ly</module>
</modules>
<repositories>
@@ -156,8 +156,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
</plugins>
16 years
- 1
- 0
Seam SVN: r12516 - modules/international/trunk.
by seam-commits＠lists.jboss.org
Author: kenfinni
Date: 2010-04-16 14:20:53 -0400 (Fri, 16 Apr 2010)
New Revision: 12516
Added:
modules/international/trunk/lgpl.txt
modules/international/trunk/readme.txt
Log:
Add license file and readme
Added: modules/international/trunk/lgpl.txt
===================================================================
--- modules/international/trunk/lgpl.txt (rev 0)
+++ modules/international/trunk/lgpl.txt 2010-04-16 18:20:53 UTC (rev 12516)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
Added: modules/international/trunk/readme.txt
===================================================================
--- modules/international/trunk/readme.txt (rev 0)
+++ modules/international/trunk/readme.txt 2010-04-16 18:20:53 UTC (rev 12516)
@@ -0,0 +1,45 @@
+
+ Seam International Module
+ 3.0.0 SNAPSHOT
+
+ What is it?
+ ===========
+
+ The Seam 3 International Module is focused on a unified approach to configuring
+ your application for the right language and locale, propagating them to all
+ parts of the application.
+
+ Contents of distribution
+ ========================
+
+ docs/
+
+ API Docs and reference guide.
+
+ examples/
+
+ Seam International examples
+
+ ...
+
+ Licensing
+ =========
+
+ This distribution, as a whole, is licensed under the terms of the Apache
+ License, Version 2.0 (see apl.txt).
+
+
+ Seam International URLs
+ ===============
+
+ Seam 3 Int'l Module: http://www.sfwk.org/Seam3/InernationalModule
+ Seam 3 Home Page: http://www.sfwk.org/Seam3
+ Downloads: http://www.sfwk.org/Seam3/DistributionDownloads
+ Forums: http://www.sfwk.org/Community/Seam3Users
+ Source Code: http://anonsvn.jboss.org/repos/seam/modules/international
+ Issue Tracking: http://jira.jboss.org/jira/browse/SEAMINTL
+
+ Release Notes
+ =============
+
+ ...
16 years
- 1
- 0
Seam SVN: r12515 - branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver.
by seam-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2010-04-16 08:58:55 -0400 (Fri, 16 Apr 2010)
New Revision: 12515
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java
Log:
getting chatroom example to be more reliable on jdk5
Modified: branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java 2010-04-16 11:12:49 UTC (rev 12514)
+++ branches/community/Seam_2_2/src/test/ftest/examples/remoting/chatroom/src/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java 2010-04-16 12:58:55 UTC (rev 12515)
@@ -112,9 +112,21 @@
public void connect()
{
- driver.findElement(NAME_INPUT).clearAndSendKeys(NAME1);
+
+ driver.findElement(NAME_INPUT).clearAndSendKeys(NAME1, Keys.TAB);
+
driver.setWaitTime(timeout);
- driver.findElement(CONNECT_BUTTON).clickAndWait();
+
+ //more reliable than simple click
+ driver.findElement(CONNECT_BUTTON).clearAndSendKeys(Keys.RETURN);
+
+ try
+ {
+ Thread.sleep(timeout);
+ }
+ catch (InterruptedException e)
+ {
+ }
}
public void verifyConnecting()
16 years
- 1
- 0
Seam SVN: r12514 - modules/faces/trunk/docs/reference/src/main/docbook/en-US.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-04-16 07:12:49 -0400 (Fri, 16 Apr 2010)
New Revision: 12514
Modified:
modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
Log:
doc update
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-04-16 11:05:25 UTC (rev 12513)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-04-16 11:12:49 UTC (rev 12514)
@@ -230,11 +230,6 @@
<entry>Before a view has been rendered</entry>
</row>
<row>
- <entry>PreRenderViewEvent</entry>
- <entry>component</entry>
- <entry>Before a view has been rendered</entry>
- </row>
- <row>
<entry>PreValidateEvent</entry>
<entry>component</entry>
<entry>Before a component has been validated</entry>
@@ -267,7 +262,9 @@
</tbody>
</tgroup>
</informaltable>
- There is only one qualifier, <literal>@Component</literal> that can be used with component events by specifying the component ID
+ There is only one qualifier, <literal>@Component</literal> that can be used with component events by specifying the component ID. Note that
+ view-centric component events <literal>PreRenderViewEvent</literal>, <literal>PostConstructViewMapEvent</literal> and
+ <literal>PreDestroyViewMapEvent</literal> do not fire with the <literal>@Component</literal> qualifier.
<programlisting role="Java">
public void observePrePasswordValidation(@Observes @Component("form:password") PreValidateEvent e)
{
16 years
- 1
- 0
Seam SVN: r12513 - in modules/faces/trunk/impl/src: test/java/org/jboss/seam/faces/event and 1 other directory.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-04-16 07:05:25 -0400 (Fri, 16 Apr 2010)
New Revision: 12513
Modified:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java
Log:
system tests
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-16 10:42:31 UTC (rev 12512)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-16 11:05:25 UTC (rev 12513)
@@ -83,27 +83,27 @@
if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId()))
{
- phaseQualifier = PhaseEventBridge.RESTORE_VIEW;
+ phaseQualifier = RESTORE_VIEW;
}
else if (PhaseId.PROCESS_VALIDATIONS.equals(event.getPhaseId()))
{
- phaseQualifier = PhaseEventBridge.PROCESS_VALIDATIONS;
+ phaseQualifier = PROCESS_VALIDATIONS;
}
else if (PhaseId.APPLY_REQUEST_VALUES.equals(event.getPhaseId()))
{
- phaseQualifier = PhaseEventBridge.APPLY_REQUEST_VALUES;
+ phaseQualifier = APPLY_REQUEST_VALUES;
}
else if (PhaseId.INVOKE_APPLICATION.equals(event.getPhaseId()))
{
- phaseQualifier = PhaseEventBridge.INVOKE_APPLICATION;
+ phaseQualifier = INVOKE_APPLICATION;
}
else if (PhaseId.UPDATE_MODEL_VALUES.equals(event.getPhaseId()))
{
- phaseQualifier = PhaseEventBridge.UPDATE_MODEL_VALUES;
+ phaseQualifier = UPDATE_MODEL_VALUES;
}
else if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
{
- phaseQualifier = PhaseEventBridge.RENDER_RESPONSE;
+ phaseQualifier = RENDER_RESPONSE;
}
else
{
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-16 10:42:31 UTC (rev 12512)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-16 11:05:25 UTC (rev 12513)
@@ -24,16 +24,25 @@
import java.util.HashMap;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIComponentBase;
-import javax.faces.event.ComponentSystemEvent;
+import javax.faces.component.UIOutput;
+import javax.faces.component.UIViewRoot;
import javax.faces.event.ExceptionQueuedEvent;
import javax.faces.event.ExceptionQueuedEventContext;
+import javax.faces.event.PostAddToViewEvent;
import javax.faces.event.PostConstructApplicationEvent;
import javax.faces.event.PostConstructCustomScopeEvent;
+import javax.faces.event.PostConstructViewMapEvent;
+import javax.faces.event.PostRestoreStateEvent;
import javax.faces.event.PostValidateEvent;
import javax.faces.event.PreDestroyApplicationEvent;
import javax.faces.event.PreDestroyCustomScopeEvent;
+import javax.faces.event.PreDestroyViewMapEvent;
+import javax.faces.event.PreRemoveFromViewEvent;
+import javax.faces.event.PreRenderComponentEvent;
+import javax.faces.event.PreRenderViewEvent;
+import javax.faces.event.PreValidateEvent;
import javax.faces.event.ScopeContext;
+import javax.faces.event.SystemEvent;
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
@@ -43,10 +52,7 @@
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
-import org.jboss.test.faces.mock.MockFacesEnvironment;
import org.jboss.test.faces.mock.application.MockApplication;
-import org.jboss.test.faces.mock.component.MockUIComponent;
-import org.jboss.test.faces.mock.component.MockUIComponentBase;
import org.jboss.test.faces.mock.context.MockFacesContext;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -67,58 +73,195 @@
}
@Inject
- SystemEventBridge systemEventListener;
+ SystemEventBridge listener;
+ @Inject
+ SystemEventObserver observer;
+
private final MockFacesContext facesContext = new MockFacesContext();
private final MockApplication application = new MockApplication();
+ private final ScopeContext scopeContext = new ScopeContext("foo", new HashMap<String, Object>());
+ private final ExceptionQueuedEventContext eventContext = new ExceptionQueuedEventContext(facesContext, new NullPointerException());
+ private static final UIComponent component = new UIOutput();
-// Skip until we find out how to set ID:s on mocks...
-// @Test
- public void testSpecificPostComponentValidation()
+ static
{
- UIComponent c = new MockUIComponent();
- System.out.println(c.getId());
- systemEventListener.processEvent(new PostValidateEvent(c));
- assert SystemEventObserver.specificComponentValidationEvent;
+ component.setId("foo");
}
@Test
- public void testExceptionQueuedEventObserver()
+ public void testObservePostConstructApplication()
{
- ExceptionQueuedEventContext eqec = new ExceptionQueuedEventContext(facesContext, new NullPointerException());
- ExceptionQueuedEvent eqe = new ExceptionQueuedEvent(eqec);
- systemEventListener.processEvent(eqe);
- assert SystemEventObserver.excecptionQueuedEvent;
+ fireAndAssert("1", new PostConstructApplicationEvent(application));
}
@Test
- public void testPostConstructApplicationEventObserver()
+ public void testObservePreDestroyApplication()
{
- systemEventListener.processEvent(new PostConstructApplicationEvent(application));
- assert SystemEventObserver.postConstructApplicationEvent;
+ fireAndAssert("2", new PreDestroyApplicationEvent(application));
}
@Test
- public void testPostConstructCustomScopeEvent()
+ public void testObservePostConstructCustomScope()
{
- ScopeContext sc = new ScopeContext("dummyscope", new HashMap<String, Object>());
- systemEventListener.processEvent(new PostConstructCustomScopeEvent(sc));
- assert SystemEventObserver.postConstructCustomScopeEvent;
+ fireAndAssert("3", new PostConstructCustomScopeEvent(scopeContext));
}
@Test
- public void testPreDestroyApplicationEventObserver()
+ public void testObservePreDestroyCustomScope()
{
- systemEventListener.processEvent(new PreDestroyApplicationEvent(application));
- assert SystemEventObserver.preDestroyApplicationEvent;
+ fireAndAssert("4", new PreDestroyCustomScopeEvent(scopeContext));
}
@Test
- public void testPreDestroyCustomScopeEventObserver()
+ public void testObserveExceptionQueued()
{
- ScopeContext sc = new ScopeContext("dummyscope", new HashMap<String, Object>());
- systemEventListener.processEvent(new PreDestroyCustomScopeEvent(sc));
- assert SystemEventObserver.preDestroyCustomScopeEvent;
+ fireAndAssert("5", new ExceptionQueuedEvent(eventContext));
}
+ @Test
+ public void testObserveComponentSystemEvent()
+ {
+ fireAndAssert("6", new PreValidateEvent(component));
+ }
+
+ @Test
+ public void testObservePreValidate()
+ {
+ fireAndAssert("7", new PreValidateEvent(component));
+ }
+
+ @Test
+ public void testObservePreValidateComponent()
+ {
+ fireAndAssert("8", new PreValidateEvent(component));
+ }
+
+ @Test
+ public void testObserveComponent()
+ {
+ fireAndAssert("9", new PreValidateEvent(component));
+ }
+
+ @Test
+ public void testObservePostValidate()
+ {
+ fireAndAssert("10", new PostValidateEvent(component));
+ }
+
+ @Test
+ public void testObservePostValidateComponent()
+ {
+ fireAndAssert("11", new PostValidateEvent(component));
+ }
+
+ @Test
+ public void testObservePostAddToView()
+ {
+ fireAndAssert("12", new PostAddToViewEvent(component));
+ }
+
+ @Test
+ public void testObservePostAddToViewComponent()
+ {
+ fireAndAssert("13", new PostAddToViewEvent(component));
+ }
+
+ @Test
+ public void testObservePostConstructViewMap()
+ {
+ fireAndAssert("14", new PostConstructViewMapEvent(new UIViewRoot()));
+ }
+
+ @Test
+ public void testObservePostRestoreState()
+ {
+ fireAndAssert("15", new PostRestoreStateEvent(component));
+ }
+
+ @Test
+ public void testObservePostRestoreStateComponent()
+ {
+ fireAndAssert("16", new PostRestoreStateEvent(component));
+ }
+
+ @Test
+ public void testObservePreDestroyViewMap()
+ {
+ fireAndAssert("17", new PreDestroyViewMapEvent(new UIViewRoot()));
+ }
+
+ @Test
+ public void testObservePreRemoveFromView()
+ {
+ fireAndAssert("18", new PreRemoveFromViewEvent(component));
+ }
+
+ @Test
+ public void testObservePreRemoveFromViewComponent()
+ {
+ fireAndAssert("19", new PreRemoveFromViewEvent(component));
+ }
+
+ @Test
+ public void testObservePreRenderComponent()
+ {
+ fireAndAssert("20", new PreRenderComponentEvent(component));
+ }
+
+ @Test
+ public void testObservePreRenderComponentComponent()
+ {
+ fireAndAssert("21", new PreRenderComponentEvent(component));
+ }
+
+ @Test
+ public void testObservePreRenderView()
+ {
+ fireAndAssert("22", new PreRenderViewEvent(new UIViewRoot()));
+ }
+
+
+ private void fireAndAssert(String caseId, SystemEvent... events)
+ {
+ observer.reset();
+ for (SystemEvent e : events) {
+ listener.processEvent(e);
+ }
+ observer.assertObservations(caseId, events);
+ }
+
+ /*
+ * @Test public void testSpecificPostComponentValidation() { UIComponent c =
+ * new UIOutput(); c.setId("foo"); systemEventListener.processEvent(new
+ * PostValidateEvent(c)); assert
+ * SystemEventObserver.specificComponentValidationEvent; }
+ *
+ * @Test public void testExceptionQueuedEventObserver() {
+ * ExceptionQueuedEventContext eqec = new
+ * ExceptionQueuedEventContext(facesContext, new NullPointerException());
+ * ExceptionQueuedEvent eqe = new ExceptionQueuedEvent(eqec);
+ * systemEventListener.processEvent(eqe); assert
+ * SystemEventObserver.excecptionQueuedEvent; }
+ *
+ * @Test public void testPostConstructApplicationEventObserver() {
+ * systemEventListener.processEvent(new
+ * PostConstructApplicationEvent(application)); assert
+ * SystemEventObserver.postConstructApplicationEvent; }
+ *
+ * @Test public void testPostConstructCustomScopeEvent() { ScopeContext sc =
+ * new ScopeContext("dummyscope", new HashMap<String, Object>());
+ * systemEventListener.processEvent(new PostConstructCustomScopeEvent(sc));
+ * assert SystemEventObserver.postConstructCustomScopeEvent; }
+ *
+ * @Test public void testPreDestroyApplicationEventObserver() {
+ * systemEventListener.processEvent(new
+ * PreDestroyApplicationEvent(application)); assert
+ * SystemEventObserver.preDestroyApplicationEvent; }
+ *
+ * @Test public void testPreDestroyCustomScopeEventObserver() { ScopeContext
+ * sc = new ScopeContext("dummyscope", new HashMap<String, Object>());
+ * systemEventListener.processEvent(new PreDestroyCustomScopeEvent(sc));
+ * assert SystemEventObserver.preDestroyCustomScopeEvent; }
+ */
}
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-16 10:42:31 UTC (rev 12512)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-16 11:05:25 UTC (rev 12513)
@@ -21,15 +21,30 @@
*/
package org.jboss.seam.faces.event;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.faces.event.ComponentSystemEvent;
import javax.faces.event.ExceptionQueuedEvent;
+import javax.faces.event.PostAddToViewEvent;
import javax.faces.event.PostConstructApplicationEvent;
import javax.faces.event.PostConstructCustomScopeEvent;
+import javax.faces.event.PostConstructViewMapEvent;
+import javax.faces.event.PostRestoreStateEvent;
import javax.faces.event.PostValidateEvent;
import javax.faces.event.PreDestroyApplicationEvent;
import javax.faces.event.PreDestroyCustomScopeEvent;
+import javax.faces.event.PreDestroyViewMapEvent;
+import javax.faces.event.PreRemoveFromViewEvent;
+import javax.faces.event.PreRenderComponentEvent;
+import javax.faces.event.PreRenderViewEvent;
+import javax.faces.event.PreValidateEvent;
+import javax.faces.event.SystemEvent;
import org.jboss.seam.faces.event.qualifier.Component;
@@ -41,46 +56,138 @@
@ApplicationScoped
public class SystemEventObserver
{
- public static boolean componentSystemEvent;
- public static boolean excecptionQueuedEvent;
- public static boolean postConstructApplicationEvent;
- public static boolean postConstructCustomScopeEvent;
- public static boolean preDestroyApplicationEvent;
- public static boolean preDestroyCustomScopeEvent;
- public static boolean specificComponentValidationEvent;
+ private Map<String, List<SystemEvent>> observations = new HashMap<String, List<SystemEvent>>();
- public void observeSpecificComponentValidation(@Observes @Component("foo") PostValidateEvent e)
+ private void recordObservation(String id, SystemEvent observation)
{
- specificComponentValidationEvent = true;
+ List<SystemEvent> observed = observations.get(id);
+ if (observed == null)
+ {
+ observed = new ArrayList<SystemEvent>();
+ observations.put(id, observed);
+ }
+ observed.add(observation);
}
- public void observeComponentSystemEvent(@Observes ComponentSystemEvent e)
+ public void reset()
{
- componentSystemEvent = true;
+ observations.clear();
}
- public void observeExceptionQueuedEvent(@Observes ExceptionQueuedEvent e)
+ public void assertObservations(String id, SystemEvent... observations)
{
- excecptionQueuedEvent = true;
+ List<SystemEvent> observed = this.observations.get(id);
+ assert observed != null && observed.size() == observations.length;
+ assert observed.containsAll(Arrays.asList(observations));
}
- public void observePostConstructApplicationEvent(@Observes PostConstructApplicationEvent e)
+ public void observe(@Observes PostConstructApplicationEvent e)
{
- postConstructApplicationEvent = true;
+ recordObservation("1", e);
}
- public void observePreDestroyApplicationEvent(@Observes PreDestroyApplicationEvent e)
+ public void observe(@Observes PreDestroyApplicationEvent e)
{
- preDestroyApplicationEvent = true;
+ recordObservation("2", e);
}
- public void observePostConstructCustomScopeEvent(@Observes PostConstructCustomScopeEvent e)
+ public void observe(@Observes PostConstructCustomScopeEvent e)
{
- postConstructCustomScopeEvent = true;
+ recordObservation("3", e);
}
- public void observePreDestroyCustomScopeEvent(@Observes PreDestroyCustomScopeEvent e)
+ public void observe(@Observes PreDestroyCustomScopeEvent e)
{
- preDestroyCustomScopeEvent = true;
+ recordObservation("4", e);
}
+
+ public void observe(@Observes ExceptionQueuedEvent e)
+ {
+ recordObservation("5", e);
+ }
+
+ public void observe(@Observes ComponentSystemEvent e)
+ {
+ recordObservation("6", e);
+ }
+
+ public void observe(@Observes PreValidateEvent e)
+ {
+ recordObservation("7", e);
+ }
+
+ public void observe2(@Observes @Component("foo") PreValidateEvent e)
+ {
+ recordObservation("8", e);
+ }
+
+ public void observe3(@Observes @Component("foo") ComponentSystemEvent e)
+ {
+ recordObservation("9", e);
+ }
+
+ public void observe(@Observes PostValidateEvent e)
+ {
+ recordObservation("10", e);
+ }
+
+ public void observe2(@Observes @Component("foo") PostValidateEvent e)
+ {
+ recordObservation("11", e);
+ }
+
+ public void observe(@Observes PostAddToViewEvent e)
+ {
+ recordObservation("12", e);
+ }
+
+ public void observe2(@Observes @Component("foo") PostAddToViewEvent e)
+ {
+ recordObservation("13", e);
+ }
+
+ public void observe2(@Observes PostConstructViewMapEvent e)
+ {
+ recordObservation("14", e);
+ }
+
+ public void observe(@Observes PostRestoreStateEvent e)
+ {
+ recordObservation("15", e);
+ }
+
+ public void observe2(@Observes @Component("foo") PostRestoreStateEvent e)
+ {
+ recordObservation("16", e);
+ }
+
+ public void observe2(@Observes PreDestroyViewMapEvent e)
+ {
+ recordObservation("17", e);
+ }
+
+ public void observe(@Observes PreRemoveFromViewEvent e)
+ {
+ recordObservation("18", e);
+ }
+
+ public void observe2(@Observes @Component("foo") PreRemoveFromViewEvent e)
+ {
+ recordObservation("19", e);
+ }
+
+ public void observe(@Observes PreRenderComponentEvent e)
+ {
+ recordObservation("20", e);
+ }
+
+ public void observe2(@Observes @Component("foo") PreRenderComponentEvent e)
+ {
+ recordObservation("21", e);
+ }
+
+ public void observe(@Observes PreRenderViewEvent e)
+ {
+ recordObservation("22", e);
+ }
}
16 years
- 1
- 0
Seam SVN: r12512 - branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2010-04-16 06:42:31 -0400 (Fri, 16 Apr 2010)
New Revision: 12512
Modified:
branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java
Log:
JBPAPP-4114
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java 2010-04-16 10:40:13 UTC (rev 12511)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java 2010-04-16 10:42:31 UTC (rev 12512)
@@ -124,8 +124,8 @@
public void editTurtleTask()
{
String turtle = "Buy a turtle";
- String newCategory = "School";
- String newDescription = "Buy a turtle and take it to school";
+ String newCategory = "Work";
+ String newDescription = "Buy a turtle and take it to work";
editTask(turtle, newCategory, newDescription);
buttonPresent(newDescription, RESOLVE_BTN_TITLE);
navigate(LOGOUT_LINK);
16 years
- 1
- 0
Seam SVN: r12511 - branches/community/Seam_2_2/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium.
by seam-commits＠lists.jboss.org
Author: jharting
Date: 2010-04-16 06:40:13 -0400 (Fri, 16 Apr 2010)
New Revision: 12511
Modified:
branches/community/Seam_2_2/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java
Log:
JBSEAM-4636 don't take turtles to school as the school may not exist (test ordering issue)
Modified: branches/community/Seam_2_2/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java 2010-04-16 08:38:30 UTC (rev 12510)
+++ branches/community/Seam_2_2/src/test/ftest/examples/tasks/src/org/jboss/seam/example/tasks/test/selenium/SeleniumTasksTest.java 2010-04-16 10:40:13 UTC (rev 12511)
@@ -124,8 +124,8 @@
public void editTurtleTask()
{
String turtle = "Buy a turtle";
- String newCategory = "School";
- String newDescription = "Buy a turtle and take it to school";
+ String newCategory = "Work";
+ String newDescription = "Buy a turtle and take it to work";
editTask(turtle, newCategory, newDescription);
buttonPresent(newDescription, RESOLVE_BTN_TITLE);
navigate(LOGOUT_LINK);
16 years
- 1
- 0