March 2010 - seam-commits - Jboss List Archives

Seam SVN: r12214 - in modules/xml/trunk: core and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-17 22:19:47 -0400 (Wed, 17 Mar 2010) New Revision: 12214 Added: modules/xml/trunk/pom.xml Removed: modules/xml/trunk/parent/ Modified: modules/xml/trunk/assembly.xml modules/xml/trunk/core/pom.xml Log: restructure build for distribution Modified: modules/xml/trunk/assembly.xml =================================================================== --- modules/xml/trunk/assembly.xml 2010-03-18 02:19:09 UTC (rev 12213) +++ modules/xml/trunk/assembly.xml 2010-03-18 02:19:47 UTC (rev 12214) @@ -9,8 +9,8 @@ <fileSets> <fileSet> - <directory>core/target/apidocs</directory> - <outputDirectory>seam-xml/doc/apidocs</outputDirectory> + <directory>core/target/site/apidocs</directory> + <outputDirectory>seam-xml/doc/api</outputDirectory> <includes> <include>**</include> </includes> @@ -35,13 +35,30 @@ <include>lgpl.txt</include> </includes> </fileSet> + + <fileSet> + <directory>core/src/main/java</directory> + <outputDirectory>seam-xml/source</outputDirectory> + <includes> + <include>**</include> + </includes> + </fileSet> </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>seam-xml/lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.jboss.weld:weld-extensions-core</include> + </includes> + </dependencySet> + </dependencySets> + <moduleSets> <moduleSet> <includes> <include>org.jboss.seam.xml:seam-xml-core:jar</include> - <include>org.jboss.weld:weld-extensions-core</include> </includes> <binaries> <outputDirectory>seam-xml/lib</outputDirectory> Modified: modules/xml/trunk/core/pom.xml =================================================================== --- modules/xml/trunk/core/pom.xml 2010-03-18 02:19:09 UTC (rev 12213) +++ modules/xml/trunk/core/pom.xml 2010-03-18 02:19:47 UTC (rev 12214) @@ -1,120 +1,99 @@ <?xml version="1.0"?> <project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>seam-xml-parent</artifactId> - <groupId>org.jboss.seam.xml</groupId> - <version>3.0.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> + <parent> + <artifactId>seam-xml-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> - <packaging>jar</packaging> - <version>${seam.version}</version> - <name>Seam XML Extension Core</name> + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-core</artifactId> + <packaging>jar</packaging> + <name>Seam XML Extension Core</name> - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> + <repositories> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> - <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>1.0-SP1</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>1.0.1-Final</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-extensions-core</artifactId> - <version>1.0.1-SNAPSHOT</version> - </dependency> + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0-SP1</version> + </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>1.0.1-Final</version> + </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-se</artifactId> - <version>1.0.1-Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <type>jar</type> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-se</artifactId> + <version>1.0.1-Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <type>jar</type> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + </dependencies> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/trunk/core</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/xml/trunk/core</developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/xml/trunk/core</url> - </scm> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/trunk/core</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/xml/trunk/core</developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/xml/trunk/core</url> + </scm> - <build> + <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <workspace>${basedir}</workspace> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <workspace>${basedir}</workspace> - <downloadJavadocs>true</downloadJavadocs> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>once</forkMode> - <argLine>-Xmx512m</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> - <executions> - <execution> - <id>javadoc-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <downloadJavadocs>true</downloadJavadocs> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>once</forkMode> + <argLine>-Xmx512m</argLine> + </configuration> + </plugin> + </plugins> + </build> </project> Added: modules/xml/trunk/pom.xml =================================================================== --- modules/xml/trunk/pom.xml (rev 0) +++ modules/xml/trunk/pom.xml 2010-03-18 02:19:47 UTC (rev 12214) @@ -0,0 +1,74 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>weld-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>8</version> + </parent> + + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-parent</artifactId> + <packaging>pom</packaging> + <version>3.0.0-SNAPSHOT</version> + <name>Seam XML Parent</name> + + <modules> + <module>core</module> + <module>docs</module> + <module>examples/princess-rescue</module> + </modules> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <configuration> + <descriptors> + <descriptor>assembly.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0-SP1</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions-core</artifactId> + <version>1.0.1-SNAPSHOT</version> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/xml/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/xml/trunk</url> + </scm> + +</project>

14 years, 2 months

1
0
0 / 0

Seam SVN: r12213 - modules/xml/trunk.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2010-03-17 22:19:09 -0400 (Wed, 17 Mar 2010) New Revision: 12213 Removed: modules/xml/trunk/pom.xml Log: removed Deleted: modules/xml/trunk/pom.xml =================================================================== --- modules/xml/trunk/pom.xml 2010-03-17 21:58:53 UTC (rev 12212) +++ modules/xml/trunk/pom.xml 2010-03-18 02:19:09 UTC (rev 12213) @@ -1,61 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 - http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - - <groupId>org.jboss.seam.xml</groupId> - <artifactId>seam-xml-build-aggregator</artifactId> - <packaging>pom</packaging> - <version>${seam.version}</version> - <name>Seam XML Build Aggregator</name> - - <modules> - <module>parent</module> - <module>core</module> - <module>docs</module> - <module>examples/princess-rescue</module> - </modules> - - <properties> - <seam.version>3.0.0-SNAPSHOT</seam.version> - </properties> - - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <descriptors> - <descriptor>assembly.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/xml/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/xml/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/xml/trunk</url> - </scm> - -</project>

14 years, 2 months

1
0
0 / 0

Seam SVN: r12212 - modules/faces/trunk.

by seam-commits＠lists.jboss.org

Author: nickarls Date: 2010-03-17 17:58:53 -0400 (Wed, 17 Mar 2010) New Revision: 12212 Modified: modules/faces/trunk/pom.xml Log: use released version of jsf-mock Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-03-17 21:29:09 UTC (rev 12211) +++ modules/faces/trunk/pom.xml 2010-03-17 21:58:53 UTC (rev 12212) @@ -15,7 +15,7 @@ <properties> <arquillian.version>1.0.0.Alpha1</arquillian.version> - <jsfmock.version>1.0.1-SNAPSHOT</jsfmock.version> + <jsfmock.version>1.0.0</jsfmock.version> </properties>

14 years, 2 months

1
0
0 / 0

Seam SVN: r12211 - in modules/faces/trunk: src/main/java/org/jboss/seam/faces and 4 other directories.

by seam-commits＠lists.jboss.org

Author: lincolnthree Date: 2010-03-17 17:29:09 -0400 (Wed, 17 Mar 2010) New Revision: 12211 Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/ExternalContextProducer.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/FacesContextProducer.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/NavigationHandlerProducer.java Removed: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FacesContextProducer.java modules/faces/trunk/src/test/resources/org/ modules/faces/trunk/src/test/resources/test-suite.xml Modified: modules/faces/trunk/pom.xml modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java Log: * Fixed POM * Moved from TestNG to JUnit * Added Arquillian profile for embedded GFv3 * Restructured producers into faces.producer * Cleaned up test resources Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-03-17 12:22:42 UTC (rev 12210) +++ modules/faces/trunk/pom.xml 2010-03-17 21:29:09 UTC (rev 12211) @@ -1,8 +1,12 @@ -<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"> +<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> + <artifactId>seam-faces</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Seam Faces Module</name> + <parent> <artifactId>seam-parent</artifactId> <groupId>org.jboss.seam</groupId> @@ -14,11 +18,6 @@ <jsfmock.version>1.0.1-SNAPSHOT</jsfmock.version> </properties> - <artifactId>seam-faces</artifactId> - <version>3.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Seam Faces Module</name> -  <repositories> <repository> @@ -33,37 +32,59 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + + <repository> + <id>Java.NET</id> + <name>Java.NET Maven2 Repository</name> + <url>http://download.java.net/maven/2/</url> + </repository> </repositories> <dependencies> <dependency> - <groupId>javax</groupId> - <artifactId>javaee-web-api</artifactId> - <version>6.0</version> +  + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.0.2</version> <scope>provided</scope> </dependency> - <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>1.0-SP1</version> - </dependency> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian</groupId> - <artifactId>arquillian-testng</artifactId> + <artifactId>arquillian-junit</artifactId> <version>${arquillian.version}</version> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.jboss.arquillian.container</groupId> @@ -76,10 +97,29 @@ <artifactId>jsf-mock</artifactId> <version>${jsfmock.version}</version> <scope>test</scope> - </dependency> + </dependency> + <dependency> + <groupId>org.jboss.jsfunit</groupId> + <artifactId>jboss-jsfunit-core</artifactId> + <version>1.2.0.Final</version> + <scope>test</scope> + </dependency> + </dependencies> + <profiles> + <profile> + <id>arquillian-glassfish-embedded-30</id> + <dependencies> + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-glassfish-embedded-30</artifactId> + <version>${arquillian.version}</version> + </dependency> + </dependencies> + </profile> + </profiles> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/trunk</connection> Deleted: modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FacesContextProducer.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FacesContextProducer.java 2010-03-17 12:22:42 UTC (rev 12210) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/context/FacesContextProducer.java 2010-03-17 21:29:09 UTC (rev 12211) @@ -1,34 +0,0 @@ -//$Id: FacesContext.java 5350 2007-06-20 17:53:19Z gavin $ -package org.jboss.seam.faces.context; - -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.faces.context.FacesContext; - -/** - * - * A producer which retrieves the current JSF FacesContext by calling - * {@link FacesContext#getCurrentInstance}, thus allowing it to be injected. - * - * - * - * QUESTION should we return null if there is no current phase id? (seems to be - * a common check) - * - * - * QUESTION is it correct to use a @RequestScoped producer? If it is @Dependent, - * then a developer could unknowingly bind it to a wider-scoped bean - * - * - * @author Gavin King - * @author Dan Allen - */ -public class FacesContextProducer -{ - public @Produces - @RequestScoped - FacesContext getFacesContext() - { - return FacesContext.getCurrentInstance(); - } -} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/ExternalContextProducer.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/ExternalContextProducer.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/ExternalContextProducer.java 2010-03-17 21:29:09 UTC (rev 12211) @@ -0,0 +1,34 @@ +//$Id: FacesContext.java 5350 2007-06-20 17:53:19Z gavin $ +package org.jboss.seam.faces.producer; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.inject.Inject; + +/** + * + * A producer which retrieves the current JSF ExternalContext by calling + * {@link FacesContext#getCurrentInstance#getExternalContext()}, thus allowing + * it to be injected. + * + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +public class ExternalContextProducer +{ + @Inject + FacesContext context; + + public @Produces + @RequestScoped + ExternalContext getExternalContext() + { + if (context != null) + { + return context.getExternalContext(); + } + return null; + } +} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/FacesContextProducer.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/FacesContextProducer.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/FacesContextProducer.java 2010-03-17 21:29:09 UTC (rev 12211) @@ -0,0 +1,34 @@ +//$Id: FacesContext.java 5350 2007-06-20 17:53:19Z gavin $ +package org.jboss.seam.faces.producer; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; +import javax.faces.context.FacesContext; + +/** + * + * A producer which retrieves the current JSF FacesContext by calling + * {@link FacesContext#getCurrentInstance}, thus allowing it to be injected. + * + * + * + * QUESTION should we return null if there is no current phase id? (seems to be + * a common check) + * + * + * QUESTION is it correct to use a @RequestScoped producer? If it is @Dependent, + * then a developer could unknowingly bind it to a wider-scoped bean + * + * + * @author Gavin King + * @author Dan Allen + */ +public class FacesContextProducer +{ + public @Produces + @RequestScoped + FacesContext getFacesContext() + { + return FacesContext.getCurrentInstance(); + } +} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/NavigationHandlerProducer.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/NavigationHandlerProducer.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/producer/NavigationHandlerProducer.java 2010-03-17 21:29:09 UTC (rev 12211) @@ -0,0 +1,38 @@ +//$Id: FacesContext.java 5350 2007-06-20 17:53:19Z gavin $ +package org.jboss.seam.faces.producer; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; +import javax.faces.application.Application; +import javax.faces.application.NavigationHandler; +import javax.faces.context.FacesContext; +import javax.inject.Inject; + +/** + * + * A producer which retrieves the current JSF NavigationHandler by calling + * {@link Application#getNavigationHandler()}, thus allowing it to be injected. + * + * + * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> + */ +public class NavigationHandlerProducer +{ + @Inject + FacesContext context; + + public @Produces + @RequestScoped + NavigationHandler getNavigationHandler() + { + if (context != null) + { + Application application = context.getApplication(); + if (application != null) + { + return application.getNavigationHandler(); + } + } + return null; + } +} Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 12:22:42 UTC (rev 12210) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 21:29:09 UTC (rev 12211) @@ -5,59 +5,58 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.testng.Arquillian; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ArchivePaths; 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.context.MockFacesContext; import org.jboss.test.faces.mock.lifecycle.MockLifecycle; -import org.testng.annotations.Test; +import org.junit.Test; +import org.junit.runner.RunWith; -@Test -public class PhaseListenerTests extends Arquillian +(a)RunWith(Arquillian.class) +public class PhaseListenerTests { - @Deployment public static JavaArchive createTestArchive() { - return Archives.create("test.jar", JavaArchive.class) - .addClasses(PhaseListenerObserver.class, PhaseEventListener.class, GenericEventListener.class) - .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return Archives.create("test.jar", JavaArchive.class).addClasses(PhaseListenerObserver.class, PhaseEventListener.class, GenericEventListener.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } - @Inject PhaseEventListener phaseEventListener; + @Inject + PhaseEventListener phaseEventListener; - private MockFacesContext facesContext = new MockFacesContext(); - private MockLifecycle lifecycle = new MockLifecycle(); - + private final MockFacesContext facesContext = new MockFacesContext(); + private final MockLifecycle lifecycle = new MockLifecycle(); + @Test public void testBeforeRenderResponseObserver() { phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, lifecycle)); assert PhaseListenerObserver.observeBeforeRenderResponse; } - + @Test public void testAfterRenderResponseObserver() { phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, lifecycle)); assert PhaseListenerObserver.observeAfterRenderResponse; } - + @Test public void testBeforeApplyRequestValuesObserver() { phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, lifecycle)); assert PhaseListenerObserver.observeBeforeApplyRequestValues; } - + @Test public void testAfterApplyRequestValuesObserver() { phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, lifecycle)); assert PhaseListenerObserver.observeAfterApplyRequestValues; - } + } @Test public void testBeforeInvokeApplicationObserver() @@ -65,13 +64,13 @@ phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, lifecycle)); assert PhaseListenerObserver.observeBeforeInvokeApplication; } - + @Test public void testAfterInvokeApplicationObserver() { phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, lifecycle)); assert PhaseListenerObserver.observeAfterInvokeApplication; - } + } @Test public void testBeforeProcessValidationsObserver() @@ -79,13 +78,13 @@ phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, lifecycle)); assert PhaseListenerObserver.observeBeforeProcessValidations; } - + @Test public void testAfterProcessValidationsObserver() { phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, lifecycle)); assert PhaseListenerObserver.observeAfterProcessValidations; - } + } @Test public void testBeforeRestoreViewObserver() @@ -93,13 +92,13 @@ phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, lifecycle)); assert PhaseListenerObserver.observeBeforeRestoreView; } - + @Test public void testAfterRestoreViewObserver() { phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, lifecycle)); assert PhaseListenerObserver.observeAfterRestoreView; - } + } @Test public void testBeforeUpdateModelValuesObserver() @@ -107,12 +106,12 @@ phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, lifecycle)); assert PhaseListenerObserver.observeBeforeUpdateModelValues; } - + @Test public void testAfterUpdateModelValuesObserver() { phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, lifecycle)); assert PhaseListenerObserver.observeAfterUpdateModelValues; - } + } } Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java 2010-03-17 12:22:42 UTC (rev 12210) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java 2010-03-17 21:29:09 UTC (rev 12211) @@ -13,7 +13,7 @@ import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.testng.Arquillian; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.Archives; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -21,33 +21,35 @@ import org.jboss.test.faces.mock.application.MockApplication; import org.jboss.test.faces.mock.component.MockUIComponent; import org.jboss.test.faces.mock.context.MockFacesContext; -import org.testng.annotations.Test; +import org.junit.Test; +import org.junit.runner.RunWith; -@Test -public class SystemEventListenerTests extends Arquillian +(a)RunWith(Arquillian.class) +public class SystemEventListenerTests { @Deployment public static JavaArchive createTestArchive() { - return Archives.create("test.jar", JavaArchive.class) - .addClasses(SystemEventObserver.class, SystemEventListener.class, GenericEventListener.class) - .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + return Archives.create("test.jar", JavaArchive.class).addClasses(SystemEventObserver.class, SystemEventListener.class, GenericEventListener.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } - - @Inject SystemEventListener systemEventListener; - private MockFacesContext facesContext = new MockFacesContext(); - private MockApplication application = new MockApplication(); - + @Inject + SystemEventListener systemEventListener; + + private final MockFacesContext facesContext = new MockFacesContext(); + private final MockApplication application = new MockApplication(); + @SuppressWarnings("serial") @Test public void testComponentSystemEventObserver() { - systemEventListener.processEvent(new ComponentSystemEvent(new MockUIComponent()){}); + systemEventListener.processEvent(new ComponentSystemEvent(new MockUIComponent()) + { + }); assert SystemEventObserver.componentSystemEvent; - } - + } + @Test public void testExceptionQueuedEventObserver() { @@ -55,15 +57,15 @@ 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() { @@ -71,20 +73,20 @@ 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; - } - + } + } Deleted: modules/faces/trunk/src/test/resources/test-suite.xml =================================================================== --- modules/faces/trunk/src/test/resources/test-suite.xml 2010-03-17 12:22:42 UTC (rev 12210) +++ modules/faces/trunk/src/test/resources/test-suite.xml 2010-03-17 21:29:09 UTC (rev 12211) @@ -1,15 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> -<suite name="Seam Faces Module Test Suite" verbose="1"> - <test name="Seam Faces Module - Unit Tests"> -  - <packages> - <package name="org.jboss.seam.faces.*"/> - </packages> - </test> -</suite>

14 years, 2 months

1
0
0 / 0

Seam SVN: r12210 - in branches/enterprise/JBPAPP_5_0: bootstrap/deploy and 13 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2010-03-17 08:22:42 -0400 (Wed, 17 Mar 2010) New Revision: 12210 Modified: branches/enterprise/JBPAPP_5_0/bootstrap/conf/login-config.xml branches/enterprise/JBPAPP_5_0/bootstrap/deploy/ejb3-interceptors-aop.xml branches/enterprise/JBPAPP_5_0/examples/blog/resources/blog-ds.xml branches/enterprise/JBPAPP_5_0/examples/booking/resources/jboss-seam-booking-ds.xml branches/enterprise/JBPAPP_5_0/examples/dvdstore/resources/jboss-seam-dvdstore-ds.xml branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-dev-ds.xml branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-prod-ds.xml branches/enterprise/JBPAPP_5_0/examples/nestedbooking/resources/jboss-seam-nestedbooking-ds.xml branches/enterprise/JBPAPP_5_0/examples/openid/resources/jboss-seam-openid-ds.xml branches/enterprise/JBPAPP_5_0/examples/seambay/resources/jboss-seam-bay-ds.xml branches/enterprise/JBPAPP_5_0/examples/seamdiscs/resources/jboss-seam-discs-ds.xml branches/enterprise/JBPAPP_5_0/examples/seamspace/resources/jboss-seam-space-ds.xml branches/enterprise/JBPAPP_5_0/examples/tasks/resources/jboss-seam-tasks-ds.xml branches/enterprise/JBPAPP_5_0/examples/ui/resources/jboss-seam-ui-example-ds.xml branches/enterprise/JBPAPP_5_0/seam-gen/resources/datasource-ds.xml branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jboss-seam-integration-tests-ds.xml Log: JBPAPP-3862 - commenting all dtds in header of datasource definitions to enable offline deployment and testing. Modified: branches/enterprise/JBPAPP_5_0/bootstrap/conf/login-config.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/bootstrap/conf/login-config.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/bootstrap/conf/login-config.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,8 +1,8 @@ <?xml version='1.0'?> -<!DOCTYPE policy PUBLIC +  + + <aop> <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/> Modified: branches/enterprise/JBPAPP_5_0/examples/blog/resources/blog-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/blog/resources/blog-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/blog/resources/blog-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>blogDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/booking/resources/jboss-seam-booking-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/booking/resources/jboss-seam-booking-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/booking/resources/jboss-seam-booking-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>bookingDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/dvdstore/resources/jboss-seam-dvdstore-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/dvdstore/resources/jboss-seam-dvdstore-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/dvdstore/resources/jboss-seam-dvdstore-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>dvdstoreDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-dev-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-dev-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-dev-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> Modified: branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-prod-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-prod-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/groovybooking/resources/groovybooking-prod-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> Modified: branches/enterprise/JBPAPP_5_0/examples/nestedbooking/resources/jboss-seam-nestedbooking-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/nestedbooking/resources/jboss-seam-nestedbooking-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/nestedbooking/resources/jboss-seam-nestedbooking-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>nestedBookingDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/openid/resources/jboss-seam-openid-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/openid/resources/jboss-seam-openid-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/openid/resources/jboss-seam-openid-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>openidDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/seambay/resources/jboss-seam-bay-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/seambay/resources/jboss-seam-bay-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/seambay/resources/jboss-seam-bay-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>seambayDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/seamdiscs/resources/jboss-seam-discs-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/seamdiscs/resources/jboss-seam-discs-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/seamdiscs/resources/jboss-seam-discs-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> Modified: branches/enterprise/JBPAPP_5_0/examples/seamspace/resources/jboss-seam-space-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/seamspace/resources/jboss-seam-space-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/seamspace/resources/jboss-seam-space-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>seamspaceDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/tasks/resources/jboss-seam-tasks-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/tasks/resources/jboss-seam-tasks-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/tasks/resources/jboss-seam-tasks-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource> <jndi-name>tasksDatasource</jndi-name> Modified: branches/enterprise/JBPAPP_5_0/examples/ui/resources/jboss-seam-ui-example-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/examples/ui/resources/jboss-seam-ui-example-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/examples/ui/resources/jboss-seam-ui-example-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> <datasources> <local-tx-datasource> Modified: branches/enterprise/JBPAPP_5_0/seam-gen/resources/datasource-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/seam-gen/resources/datasource-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/seam-gen/resources/datasource-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,7 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> <datasources> <local-tx-datasource> Modified: branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jboss-seam-integration-tests-ds.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jboss-seam-integration-tests-ds.xml 2010-03-17 12:18:22 UTC (rev 12209) +++ branches/enterprise/JBPAPP_5_0/src/test/integration/resources/jboss-seam-integration-tests-ds.xml 2010-03-17 12:22:42 UTC (rev 12210) @@ -1,9 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE datasources - PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN" - "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd"> - <datasources> <local-tx-datasource>

14 years, 2 months

1
0
0 / 0

Seam SVN: r12209 - modules/faces/trunk/src/test/java/org/jboss/seam/faces/event.

by seam-commits＠lists.jboss.org

Author: nickarls Date: 2010-03-17 08:18:22 -0400 (Wed, 17 Mar 2010) New Revision: 12209 Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java Log: cleanup Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 12:13:29 UTC (rev 12208) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 12:18:22 UTC (rev 12209) @@ -10,7 +10,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.context.MockFacesContext; import org.jboss.test.faces.mock.lifecycle.MockLifecycle; import org.testng.annotations.Test; @@ -28,90 +28,90 @@ @Inject PhaseEventListener phaseEventListener; - private MockFacesEnvironment environment = MockFacesEnvironment.createEnvironment(); + private MockFacesContext facesContext = new MockFacesContext(); private MockLifecycle lifecycle = new MockLifecycle(); @Test public void testBeforeRenderResponseObserver() { - phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); + phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, lifecycle)); assert PhaseListenerObserver.observeBeforeRenderResponse; } @Test public void testAfterRenderResponseObserver() { - phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); + phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, lifecycle)); assert PhaseListenerObserver.observeAfterRenderResponse; } @Test public void testBeforeApplyRequestValuesObserver() { - phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.APPLY_REQUEST_VALUES, lifecycle)); + phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, lifecycle)); assert PhaseListenerObserver.observeBeforeApplyRequestValues; } @Test public void testAfterApplyRequestValuesObserver() { - phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.APPLY_REQUEST_VALUES, lifecycle)); + phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, lifecycle)); assert PhaseListenerObserver.observeAfterApplyRequestValues; } @Test public void testBeforeInvokeApplicationObserver() { - phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.INVOKE_APPLICATION, lifecycle)); + phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, lifecycle)); assert PhaseListenerObserver.observeBeforeInvokeApplication; } @Test public void testAfterInvokeApplicationObserver() { - phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.INVOKE_APPLICATION, lifecycle)); + phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, lifecycle)); assert PhaseListenerObserver.observeAfterInvokeApplication; } @Test public void testBeforeProcessValidationsObserver() { - phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.PROCESS_VALIDATIONS, lifecycle)); + phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, lifecycle)); assert PhaseListenerObserver.observeBeforeProcessValidations; } @Test public void testAfterProcessValidationsObserver() { - phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.PROCESS_VALIDATIONS, lifecycle)); + phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, lifecycle)); assert PhaseListenerObserver.observeAfterProcessValidations; } @Test public void testBeforeRestoreViewObserver() { - phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RESTORE_VIEW, lifecycle)); + phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, lifecycle)); assert PhaseListenerObserver.observeBeforeRestoreView; } @Test public void testAfterRestoreViewObserver() { - phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RESTORE_VIEW, lifecycle)); + phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, lifecycle)); assert PhaseListenerObserver.observeAfterRestoreView; } @Test public void testBeforeUpdateModelValuesObserver() { - phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.UPDATE_MODEL_VALUES, lifecycle)); + phaseEventListener.beforePhase(new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, lifecycle)); assert PhaseListenerObserver.observeBeforeUpdateModelValues; } @Test public void testAfterUpdateModelValuesObserver() { - phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.UPDATE_MODEL_VALUES, lifecycle)); + phaseEventListener.afterPhase(new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, lifecycle)); assert PhaseListenerObserver.observeAfterUpdateModelValues; } Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java 2010-03-17 12:13:29 UTC (rev 12208) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java 2010-03-17 12:18:22 UTC (rev 12209) @@ -2,7 +2,6 @@ import java.util.HashMap; -import javax.faces.application.Application; import javax.faces.event.ComponentSystemEvent; import javax.faces.event.ExceptionQueuedEvent; import javax.faces.event.ExceptionQueuedEventContext; @@ -19,10 +18,9 @@ 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.lifecycle.MockLifecycle; +import org.jboss.test.faces.mock.context.MockFacesContext; import org.testng.annotations.Test; @Test @@ -39,7 +37,7 @@ @Inject SystemEventListener systemEventListener; - private MockFacesEnvironment environment = MockFacesEnvironment.createEnvironment(); + private MockFacesContext facesContext = new MockFacesContext(); private MockApplication application = new MockApplication(); @SuppressWarnings("serial") @@ -53,7 +51,7 @@ @Test public void testExceptionQueuedEventObserver() { - ExceptionQueuedEventContext eqec = new ExceptionQueuedEventContext(environment.getFacesContext(), new NullPointerException()); + ExceptionQueuedEventContext eqec = new ExceptionQueuedEventContext(facesContext, new NullPointerException()); ExceptionQueuedEvent eqe = new ExceptionQueuedEvent(eqec); systemEventListener.processEvent(eqe); assert SystemEventObserver.excecptionQueuedEvent;

14 years, 2 months

1
0
0 / 0

Seam SVN: r12208 - in modules/faces/trunk/src: test/java/org/jboss/seam/faces/event and 1 other directory.

by seam-commits＠lists.jboss.org

Author: nickarls Date: 2010-03-17 08:13:29 -0400 (Wed, 17 Mar 2010) New Revision: 12208 Added: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerObserver.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java Removed: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java Modified: modules/faces/trunk/src/main/resources/META-INF/faces-config.xml modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java Log: System event listeners Modified: modules/faces/trunk/src/main/resources/META-INF/faces-config.xml =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/faces-config.xml 2010-03-17 11:32:35 UTC (rev 12207) +++ modules/faces/trunk/src/main/resources/META-INF/faces-config.xml 2010-03-17 12:13:29 UTC (rev 12208) @@ -5,20 +5,46 @@ version="2.0" id="seam3"> - <name>seam3</name> + <name>seam3</name> - <ordering> - <after> - <name>weld</name> - </after> - </ordering> - - - <lifecycle> - <phase-listener>org.jboss.seam.faces.context.FlashScopedContext</phase-listener> - <phase-listener>org.jboss.seam.faces.PhaseEventListener</phase-listener> - </lifecycle> - + <ordering> + <after> + <name>weld</name> + </after> + </ordering> + + <lifecycle> + <phase-listener>org.jboss.seam.faces.context.FlashScopedContext</phase-listener> + <phase-listener>org.jboss.seam.faces.PhaseEventListener</phase-listener> + </lifecycle> + + <application> + <system-event-listener> + <system-event-listener-class>org.jboss.seam.faces.event.SystemEventListener</system-event-listener-class> + <system-event-class>javax.faces.event.ComponentSystemEvent</system-event-class> + </system-event-listener> + <system-event-listener> + <system-event-listener-class>org.jboss.seam.faces.event.SystemEventListener</system-event-listener-class> + <system-event-class>javax.faces.event.ExceptionQueuedEvent</system-event-class> + </system-event-listener> + <system-event-listener> + <system-event-listener-class>org.jboss.seam.faces.event.SystemEventListener</system-event-listener-class> + <system-event-class>javax.faces.event.PostConstructApplicationEvent</system-event-class> + </system-event-listener> + <system-event-listener> + <system-event-listener-class>org.jboss.seam.faces.event.SystemEventListener</system-event-listener-class> + <system-event-class>javax.faces.event.PostConstructCustomScopeEvent</system-event-class> + </system-event-listener> + <system-event-listener> + <system-event-listener-class>org.jboss.seam.faces.event.SystemEventListener</system-event-listener-class> + <system-event-class>javax.faces.event.PreDestroyApplicationEvent</system-event-class> + </system-event-listener> + <system-event-listener> + <system-event-listener-class>org.jboss.seam.faces.event.SystemEventListener</system-event-listener-class> + <system-event-class>javax.faces.event.PreDestroyCustomScopeEvent</system-event-class> + </system-event-listener> + </application> +  - - <component> - <component-type>org.jboss.seam.faces.ViewAction</component-type> - <component-class>org.jboss.seam.faces.component.UIViewAction</component-class> - </component> + <component> + <component-type>org.jboss.seam.faces.ViewAction</component-type> + <component-class>org.jboss.seam.faces.component.UIViewAction</component-class> + </component> + </faces-config> Deleted: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java 2010-03-17 11:32:35 UTC (rev 12207) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java 2010-03-17 12:13:29 UTC (rev 12208) @@ -1,92 +0,0 @@ -package org.jboss.seam.faces.event; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.faces.event.PhaseEvent; - -import org.jboss.seam.faces.event.qualifier.After; -import org.jboss.seam.faces.event.qualifier.ApplyRequestValues; -import org.jboss.seam.faces.event.qualifier.Before; -import org.jboss.seam.faces.event.qualifier.InvokeApplication; -import org.jboss.seam.faces.event.qualifier.ProcessValidations; -import org.jboss.seam.faces.event.qualifier.RenderResponse; -import org.jboss.seam.faces.event.qualifier.RestoreView; -import org.jboss.seam.faces.event.qualifier.UpdateModelValues; - -@ApplicationScoped -public class Observer -{ - public static boolean observeBeforeRenderResponse; - public static boolean observeAfterRenderResponse; - public static boolean observeBeforeApplyRequestValues; - public static boolean observeAfterApplyRequestValues; - public static boolean observeBeforeInvokeApplication; - public static boolean observeAfterInvokeApplication; - public static boolean observeBeforeProcessValidations; - public static boolean observeAfterProcessValidations; - public static boolean observeBeforeRestoreView; - public static boolean observeAfterRestoreView; - public static boolean observeBeforeUpdateModelValues; - public static boolean observeAfterUpdateModelValues; - - public void observeBeforeRenderResponse(@Observes @Before @RenderResponse PhaseEvent e) - { - Observer.observeBeforeRenderResponse = true; - } - - public void observeAfterRenderResponse(@Observes @After @RenderResponse PhaseEvent e) - { - Observer.observeAfterRenderResponse = true; - } - - public void observeBeforeApplyRequestValues(@Observes @Before @ApplyRequestValues PhaseEvent e) - { - Observer.observeBeforeApplyRequestValues = true; - } - - public void observeAfterApplyRequestValues(@Observes @After @ApplyRequestValues PhaseEvent e) - { - Observer.observeAfterApplyRequestValues = true; - } - - public void observeBeforeInvokeApplication(@Observes @Before @InvokeApplication PhaseEvent e) - { - Observer.observeBeforeInvokeApplication = true; - } - - public void observeAfterInvokeApplication(@Observes @After @InvokeApplication PhaseEvent e) - { - Observer.observeAfterInvokeApplication = true; - } - - public void observeBeforeProcessValidations(@Observes @Before @ProcessValidations PhaseEvent e) - { - Observer.observeBeforeProcessValidations = true; - } - - public void observeAfterProcessValidations(@Observes @After @ProcessValidations PhaseEvent e) - { - Observer.observeAfterProcessValidations = true; - } - - public void observeBeforeRestoreView(@Observes @Before @RestoreView PhaseEvent e) - { - Observer.observeBeforeRestoreView = true; - } - - public void observeAfterRestoreView(@Observes @After @RestoreView PhaseEvent e) - { - Observer.observeAfterRestoreView = true; - } - - public void observeBeforeUpdateModelValues(@Observes @Before @UpdateModelValues PhaseEvent e) - { - Observer.observeBeforeUpdateModelValues = true; - } - - public void observeAfterUpdateModelValues(@Observes @After @UpdateModelValues PhaseEvent e) - { - Observer.observeAfterUpdateModelValues = true; - } - -} Copied: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerObserver.java (from rev 12207, modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java) =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerObserver.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerObserver.java 2010-03-17 12:13:29 UTC (rev 12208) @@ -0,0 +1,92 @@ +package org.jboss.seam.faces.event; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.faces.event.PhaseEvent; + +import org.jboss.seam.faces.event.qualifier.After; +import org.jboss.seam.faces.event.qualifier.ApplyRequestValues; +import org.jboss.seam.faces.event.qualifier.Before; +import org.jboss.seam.faces.event.qualifier.InvokeApplication; +import org.jboss.seam.faces.event.qualifier.ProcessValidations; +import org.jboss.seam.faces.event.qualifier.RenderResponse; +import org.jboss.seam.faces.event.qualifier.RestoreView; +import org.jboss.seam.faces.event.qualifier.UpdateModelValues; + +@ApplicationScoped +public class PhaseListenerObserver +{ + public static boolean observeBeforeRenderResponse; + public static boolean observeAfterRenderResponse; + public static boolean observeBeforeApplyRequestValues; + public static boolean observeAfterApplyRequestValues; + public static boolean observeBeforeInvokeApplication; + public static boolean observeAfterInvokeApplication; + public static boolean observeBeforeProcessValidations; + public static boolean observeAfterProcessValidations; + public static boolean observeBeforeRestoreView; + public static boolean observeAfterRestoreView; + public static boolean observeBeforeUpdateModelValues; + public static boolean observeAfterUpdateModelValues; + + public void observeBeforeRenderResponse(@Observes @Before @RenderResponse PhaseEvent e) + { + PhaseListenerObserver.observeBeforeRenderResponse = true; + } + + public void observeAfterRenderResponse(@Observes @After @RenderResponse PhaseEvent e) + { + PhaseListenerObserver.observeAfterRenderResponse = true; + } + + public void observeBeforeApplyRequestValues(@Observes @Before @ApplyRequestValues PhaseEvent e) + { + PhaseListenerObserver.observeBeforeApplyRequestValues = true; + } + + public void observeAfterApplyRequestValues(@Observes @After @ApplyRequestValues PhaseEvent e) + { + PhaseListenerObserver.observeAfterApplyRequestValues = true; + } + + public void observeBeforeInvokeApplication(@Observes @Before @InvokeApplication PhaseEvent e) + { + PhaseListenerObserver.observeBeforeInvokeApplication = true; + } + + public void observeAfterInvokeApplication(@Observes @After @InvokeApplication PhaseEvent e) + { + PhaseListenerObserver.observeAfterInvokeApplication = true; + } + + public void observeBeforeProcessValidations(@Observes @Before @ProcessValidations PhaseEvent e) + { + PhaseListenerObserver.observeBeforeProcessValidations = true; + } + + public void observeAfterProcessValidations(@Observes @After @ProcessValidations PhaseEvent e) + { + PhaseListenerObserver.observeAfterProcessValidations = true; + } + + public void observeBeforeRestoreView(@Observes @Before @RestoreView PhaseEvent e) + { + PhaseListenerObserver.observeBeforeRestoreView = true; + } + + public void observeAfterRestoreView(@Observes @After @RestoreView PhaseEvent e) + { + PhaseListenerObserver.observeAfterRestoreView = true; + } + + public void observeBeforeUpdateModelValues(@Observes @Before @UpdateModelValues PhaseEvent e) + { + PhaseListenerObserver.observeBeforeUpdateModelValues = true; + } + + public void observeAfterUpdateModelValues(@Observes @After @UpdateModelValues PhaseEvent e) + { + PhaseListenerObserver.observeAfterUpdateModelValues = true; + } + +} Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 11:32:35 UTC (rev 12207) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 12:13:29 UTC (rev 12208) @@ -1,18 +1,11 @@ package org.jboss.seam.faces.event; -import javax.enterprise.util.AnnotationLiteral; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.testng.Arquillian; -import org.jboss.seam.faces.event.qualifier.ApplyRequestValues; -import org.jboss.seam.faces.event.qualifier.InvokeApplication; -import org.jboss.seam.faces.event.qualifier.ProcessValidations; -import org.jboss.seam.faces.event.qualifier.RenderResponse; -import org.jboss.seam.faces.event.qualifier.RestoreView; -import org.jboss.seam.faces.event.qualifier.UpdateModelValues; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.Archives; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -29,97 +22,97 @@ public static JavaArchive createTestArchive() { return Archives.create("test.jar", JavaArchive.class) - .addClasses(Observer.class, PhaseEventListener.class, GenericEventListener.class) + .addClasses(PhaseListenerObserver.class, PhaseEventListener.class, GenericEventListener.class) .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); } @Inject PhaseEventListener phaseEventListener; - MockFacesEnvironment environment = MockFacesEnvironment.createEnvironment(); - MockLifecycle lifecycle = new MockLifecycle(); + private MockFacesEnvironment environment = MockFacesEnvironment.createEnvironment(); + private MockLifecycle lifecycle = new MockLifecycle(); @Test - public void testBeforeRenderResponse() + public void testBeforeRenderResponseObserver() { phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); - assert Observer.observeBeforeRenderResponse; + assert PhaseListenerObserver.observeBeforeRenderResponse; } @Test - public void testAfterRenderResponse() + public void testAfterRenderResponseObserver() { phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); - assert Observer.observeAfterRenderResponse; + assert PhaseListenerObserver.observeAfterRenderResponse; } @Test - public void testBeforeApplyRequestValues() + public void testBeforeApplyRequestValuesObserver() { phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.APPLY_REQUEST_VALUES, lifecycle)); - assert Observer.observeBeforeApplyRequestValues; + assert PhaseListenerObserver.observeBeforeApplyRequestValues; } @Test - public void testAfterApplyRequestValues() + public void testAfterApplyRequestValuesObserver() { phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.APPLY_REQUEST_VALUES, lifecycle)); - assert Observer.observeAfterApplyRequestValues; + assert PhaseListenerObserver.observeAfterApplyRequestValues; } @Test - public void testBeforeInvokeApplication() + public void testBeforeInvokeApplicationObserver() { phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.INVOKE_APPLICATION, lifecycle)); - assert Observer.observeBeforeInvokeApplication; + assert PhaseListenerObserver.observeBeforeInvokeApplication; } @Test - public void testAfterInvokeApplication() + public void testAfterInvokeApplicationObserver() { phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.INVOKE_APPLICATION, lifecycle)); - assert Observer.observeAfterInvokeApplication; + assert PhaseListenerObserver.observeAfterInvokeApplication; } @Test - public void testBeforeProcessValidations() + public void testBeforeProcessValidationsObserver() { phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.PROCESS_VALIDATIONS, lifecycle)); - assert Observer.observeBeforeProcessValidations; + assert PhaseListenerObserver.observeBeforeProcessValidations; } @Test - public void testAfterProcessValidations() + public void testAfterProcessValidationsObserver() { phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.PROCESS_VALIDATIONS, lifecycle)); - assert Observer.observeAfterProcessValidations; + assert PhaseListenerObserver.observeAfterProcessValidations; } @Test - public void testBeforeRestoreView() + public void testBeforeRestoreViewObserver() { phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RESTORE_VIEW, lifecycle)); - assert Observer.observeBeforeRestoreView; + assert PhaseListenerObserver.observeBeforeRestoreView; } @Test - public void testAfterRestoreView() + public void testAfterRestoreViewObserver() { phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RESTORE_VIEW, lifecycle)); - assert Observer.observeAfterRestoreView; + assert PhaseListenerObserver.observeAfterRestoreView; } @Test - public void testBeforeUpdateModelValues() + public void testBeforeUpdateModelValuesObserver() { phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.UPDATE_MODEL_VALUES, lifecycle)); - assert Observer.observeBeforeUpdateModelValues; + assert PhaseListenerObserver.observeBeforeUpdateModelValues; } @Test - public void testAfterUpdateModelValues() + public void testAfterUpdateModelValuesObserver() { phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.UPDATE_MODEL_VALUES, lifecycle)); - assert Observer.observeAfterUpdateModelValues; + assert PhaseListenerObserver.observeAfterUpdateModelValues; } } Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java 2010-03-17 11:32:35 UTC (rev 12207) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java 2010-03-17 12:13:29 UTC (rev 12208) @@ -1,6 +1,92 @@ package org.jboss.seam.faces.event; -public class SystemEventListenerTests +import java.util.HashMap; + +import javax.faces.application.Application; +import javax.faces.event.ComponentSystemEvent; +import javax.faces.event.ExceptionQueuedEvent; +import javax.faces.event.ExceptionQueuedEventContext; +import javax.faces.event.PostConstructApplicationEvent; +import javax.faces.event.PostConstructCustomScopeEvent; +import javax.faces.event.PreDestroyApplicationEvent; +import javax.faces.event.PreDestroyCustomScopeEvent; +import javax.faces.event.ScopeContext; +import javax.inject.Inject; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.testng.Arquillian; +import org.jboss.shrinkwrap.api.ArchivePaths; +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.lifecycle.MockLifecycle; +import org.testng.annotations.Test; + +@Test +public class SystemEventListenerTests extends Arquillian { + @Deployment + public static JavaArchive createTestArchive() + { + return Archives.create("test.jar", JavaArchive.class) + .addClasses(SystemEventObserver.class, SystemEventListener.class, GenericEventListener.class) + .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + } + + @Inject SystemEventListener systemEventListener; + + private MockFacesEnvironment environment = MockFacesEnvironment.createEnvironment(); + private MockApplication application = new MockApplication(); + + @SuppressWarnings("serial") + @Test + public void testComponentSystemEventObserver() + { + systemEventListener.processEvent(new ComponentSystemEvent(new MockUIComponent()){}); + assert SystemEventObserver.componentSystemEvent; + } + + @Test + public void testExceptionQueuedEventObserver() + { + ExceptionQueuedEventContext eqec = new ExceptionQueuedEventContext(environment.getFacesContext(), 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; + } + } Added: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-03-17 12:13:29 UTC (rev 12208) @@ -0,0 +1,52 @@ +package org.jboss.seam.faces.event; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; + +import org.jboss.seam.faces.event.qualifier.ComponentSystemEvent; +import org.jboss.seam.faces.event.qualifier.ExceptionQueuedEvent; +import org.jboss.seam.faces.event.qualifier.PostConstructApplicationEvent; +import org.jboss.seam.faces.event.qualifier.PostConstructCustomScopeEvent; +import org.jboss.seam.faces.event.qualifier.PreDestroyApplicationEvent; +import org.jboss.seam.faces.event.qualifier.PreDestroyCustomScopeEvent; + +@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 void observeComponentSystemEvent(@Observes @ComponentSystemEvent javax.faces.event.ComponentSystemEvent e) + { + componentSystemEvent = true; + } + + public void observeExceptionQueuedEvent(@Observes @ExceptionQueuedEvent javax.faces.event.ExceptionQueuedEvent e) + { + excecptionQueuedEvent = true; + } + + public void observePostConstructApplicationEvent(@Observes @PostConstructApplicationEvent javax.faces.event.PostConstructApplicationEvent e) + { + postConstructApplicationEvent = true; + } + + public void observePreDestroyApplicationEvent(@Observes @PreDestroyApplicationEvent javax.faces.event.PreDestroyApplicationEvent e) + { + preDestroyApplicationEvent = true; + } + + public void observePostConstructCustomScopeEvent(@Observes @PostConstructCustomScopeEvent javax.faces.event.PostConstructCustomScopeEvent e) + { + postConstructCustomScopeEvent = true; + } + + public void observePreDestroyCustomScopeEvent(@Observes @PreDestroyCustomScopeEvent javax.faces.event.PreDestroyCustomScopeEvent e) + { + preDestroyCustomScopeEvent = true; + } +}

14 years, 2 months

1
0
0 / 0

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

by seam-commits＠lists.jboss.org

Author: nickarls Date: 2010-03-17 07:32:35 -0400 (Wed, 17 Mar 2010) New Revision: 12207 Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java modules/faces/trunk/src/main/resources/META-INF/faces-config.xml modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java Log: Some more tests Hooking up listener in faces-config.xml More generic manager lookup Modified: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java 2010-03-17 10:47:07 UTC (rev 12206) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java 2010-03-17 11:32:35 UTC (rev 12207) @@ -2,15 +2,32 @@ import javax.enterprise.inject.spi.BeanManager; import javax.inject.Inject; +import javax.naming.InitialContext; +import javax.naming.NamingException; -import org.jboss.weld.Container; - public class GenericEventListener { - @Inject BeanManager beanManager; - + @Inject + BeanManager beanManager; + protected BeanManager getBeanManager() { - return beanManager != null ? beanManager : Container.instance().deploymentManager(); + if (beanManager == null) + { + beanManager = lookupBeanManager(); + } + return beanManager; } + + private BeanManager lookupBeanManager() + { + try + { + return beanManager = (BeanManager) new InitialContext().lookup("java:comp/BeanManager"); + } + catch (NamingException e) + { + throw new IllegalArgumentException("Could not find BeanManager in JNDI", e); + } + } } Modified: modules/faces/trunk/src/main/resources/META-INF/faces-config.xml =================================================================== --- modules/faces/trunk/src/main/resources/META-INF/faces-config.xml 2010-03-17 10:47:07 UTC (rev 12206) +++ modules/faces/trunk/src/main/resources/META-INF/faces-config.xml 2010-03-17 11:32:35 UTC (rev 12207) @@ -16,6 +16,7 @@ <lifecycle> <phase-listener>org.jboss.seam.faces.context.FlashScopedContext</phase-listener> + <phase-listener>org.jboss.seam.faces.PhaseEventListener</phase-listener> </lifecycle> <!-- Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java 2010-03-17 10:47:07 UTC (rev 12206) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java 2010-03-17 11:32:35 UTC (rev 12207) @@ -5,14 +5,29 @@ import javax.faces.event.PhaseEvent; import org.jboss.seam.faces.event.qualifier.After; +import org.jboss.seam.faces.event.qualifier.ApplyRequestValues; import org.jboss.seam.faces.event.qualifier.Before; +import org.jboss.seam.faces.event.qualifier.InvokeApplication; +import org.jboss.seam.faces.event.qualifier.ProcessValidations; import org.jboss.seam.faces.event.qualifier.RenderResponse; +import org.jboss.seam.faces.event.qualifier.RestoreView; +import org.jboss.seam.faces.event.qualifier.UpdateModelValues; @ApplicationScoped public class Observer { public static boolean observeBeforeRenderResponse; public static boolean observeAfterRenderResponse; + public static boolean observeBeforeApplyRequestValues; + public static boolean observeAfterApplyRequestValues; + public static boolean observeBeforeInvokeApplication; + public static boolean observeAfterInvokeApplication; + public static boolean observeBeforeProcessValidations; + public static boolean observeAfterProcessValidations; + public static boolean observeBeforeRestoreView; + public static boolean observeAfterRestoreView; + public static boolean observeBeforeUpdateModelValues; + public static boolean observeAfterUpdateModelValues; public void observeBeforeRenderResponse(@Observes @Before @RenderResponse PhaseEvent e) { @@ -24,5 +39,54 @@ Observer.observeAfterRenderResponse = true; } + public void observeBeforeApplyRequestValues(@Observes @Before @ApplyRequestValues PhaseEvent e) + { + Observer.observeBeforeApplyRequestValues = true; + } + + public void observeAfterApplyRequestValues(@Observes @After @ApplyRequestValues PhaseEvent e) + { + Observer.observeAfterApplyRequestValues = true; + } + + public void observeBeforeInvokeApplication(@Observes @Before @InvokeApplication PhaseEvent e) + { + Observer.observeBeforeInvokeApplication = true; + } + + public void observeAfterInvokeApplication(@Observes @After @InvokeApplication PhaseEvent e) + { + Observer.observeAfterInvokeApplication = true; + } + + public void observeBeforeProcessValidations(@Observes @Before @ProcessValidations PhaseEvent e) + { + Observer.observeBeforeProcessValidations = true; + } + + public void observeAfterProcessValidations(@Observes @After @ProcessValidations PhaseEvent e) + { + Observer.observeAfterProcessValidations = true; + } + + public void observeBeforeRestoreView(@Observes @Before @RestoreView PhaseEvent e) + { + Observer.observeBeforeRestoreView = true; + } + + public void observeAfterRestoreView(@Observes @After @RestoreView PhaseEvent e) + { + Observer.observeAfterRestoreView = true; + } + + public void observeBeforeUpdateModelValues(@Observes @Before @UpdateModelValues PhaseEvent e) + { + Observer.observeBeforeUpdateModelValues = true; + } + + public void observeAfterUpdateModelValues(@Observes @After @UpdateModelValues PhaseEvent e) + { + Observer.observeAfterUpdateModelValues = true; + } + } - Modified: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 10:47:07 UTC (rev 12206) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 11:32:35 UTC (rev 12207) @@ -1,11 +1,18 @@ package org.jboss.seam.faces.event; +import javax.enterprise.util.AnnotationLiteral; import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.inject.Inject; import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.testng.Arquillian; +import org.jboss.seam.faces.event.qualifier.ApplyRequestValues; +import org.jboss.seam.faces.event.qualifier.InvokeApplication; +import org.jboss.seam.faces.event.qualifier.ProcessValidations; +import org.jboss.seam.faces.event.qualifier.RenderResponse; +import org.jboss.seam.faces.event.qualifier.RestoreView; +import org.jboss.seam.faces.event.qualifier.UpdateModelValues; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.Archives; import org.jboss.shrinkwrap.api.spec.JavaArchive; @@ -27,7 +34,6 @@ } @Inject PhaseEventListener phaseEventListener; - @Inject Observer observer; MockFacesEnvironment environment = MockFacesEnvironment.createEnvironment(); MockLifecycle lifecycle = new MockLifecycle(); @@ -36,14 +42,84 @@ public void testBeforeRenderResponse() { phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); - assert observer.observeBeforeRenderResponse; + assert Observer.observeBeforeRenderResponse; } @Test public void testAfterRenderResponse() { phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); - assert observer.observeAfterRenderResponse; + assert Observer.observeAfterRenderResponse; } + @Test + public void testBeforeApplyRequestValues() + { + phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.APPLY_REQUEST_VALUES, lifecycle)); + assert Observer.observeBeforeApplyRequestValues; + } + + @Test + public void testAfterApplyRequestValues() + { + phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.APPLY_REQUEST_VALUES, lifecycle)); + assert Observer.observeAfterApplyRequestValues; + } + + @Test + public void testBeforeInvokeApplication() + { + phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.INVOKE_APPLICATION, lifecycle)); + assert Observer.observeBeforeInvokeApplication; + } + + @Test + public void testAfterInvokeApplication() + { + phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.INVOKE_APPLICATION, lifecycle)); + assert Observer.observeAfterInvokeApplication; + } + + @Test + public void testBeforeProcessValidations() + { + phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.PROCESS_VALIDATIONS, lifecycle)); + assert Observer.observeBeforeProcessValidations; + } + + @Test + public void testAfterProcessValidations() + { + phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.PROCESS_VALIDATIONS, lifecycle)); + assert Observer.observeAfterProcessValidations; + } + + @Test + public void testBeforeRestoreView() + { + phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RESTORE_VIEW, lifecycle)); + assert Observer.observeBeforeRestoreView; + } + + @Test + public void testAfterRestoreView() + { + phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RESTORE_VIEW, lifecycle)); + assert Observer.observeAfterRestoreView; + } + + @Test + public void testBeforeUpdateModelValues() + { + phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.UPDATE_MODEL_VALUES, lifecycle)); + assert Observer.observeBeforeUpdateModelValues; + } + + @Test + public void testAfterUpdateModelValues() + { + phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.UPDATE_MODEL_VALUES, lifecycle)); + assert Observer.observeAfterUpdateModelValues; + } + }

14 years, 2 months

1
0
0 / 0

Seam SVN: r12206 - in modules/faces/trunk: src/main/java/org/jboss/seam/faces and 4 other directories.

by seam-commits＠lists.jboss.org

Author: nickarls Date: 2010-03-17 06:47:07 -0400 (Wed, 17 Mar 2010) New Revision: 12206 Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/PhaseEventListener.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/SystemEventListener.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/After.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ApplyRequestValues.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/Before.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ComponentSystemEvent.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ExceptionQueuedEvent.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/InvokeApplication.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructApplicationEvent.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructCustomScopeEvent.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyApplicationEvent.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyCustomScopeEvent.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ProcessValidations.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RenderResponse.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RestoreView.java modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/UpdateModelValues.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java Modified: modules/faces/trunk/pom.xml Log: Project set up for Arquillian + JSF mock + embedded Weld PhaseListener -> CDI event propagation Test stubs for simple case (to be extended) Modified: modules/faces/trunk/pom.xml =================================================================== --- modules/faces/trunk/pom.xml 2010-03-16 14:23:35 UTC (rev 12205) +++ modules/faces/trunk/pom.xml 2010-03-17 10:47:07 UTC (rev 12206) @@ -1,51 +1,90 @@ <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> + <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>seam-parent</artifactId> - <groupId>org.jboss.seam</groupId> - <version>3.0.0-SNAPSHOT</version> - </parent> + <parent> + <artifactId>seam-parent</artifactId> + <groupId>org.jboss.seam</groupId> + <version>3.0.0-SNAPSHOT</version> + </parent> - <artifactId>seam-faces</artifactId> - <version>3.0.0-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Seam Faces Module</name> - -  - <repositories> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> + <properties> + <arquillian.version>1.0.0.Alpha1</arquillian.version> + <jsfmock.version>1.0.1-SNAPSHOT</jsfmock.version> + </properties> - <dependencies> + <artifactId>seam-faces</artifactId> + <version>3.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Seam Faces Module</name> - <dependency> - <groupId>javax</groupId> - <artifactId>javaee-web-api</artifactId> - <version>6.0</version> - <scope>provided</scope> - </dependency> +  + <repositories> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> - </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/faces/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/Seam/modules/faces/trunk</url> - </scm> + <dependencies> + <dependency> + <groupId>javax</groupId> + <artifactId>javaee-web-api</artifactId> + <version>6.0</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.0-SP1</version> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-testng</artifactId> + <version>${arquillian.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-weld-embedded</artifactId> + <version>${arquillian.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-jsf</groupId> + <artifactId>jsf-mock</artifactId> + <version>${jsfmock.version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/faces/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/faces/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/Seam/modules/faces/trunk</url> + </scm> + </project> Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/GenericEventListener.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,16 @@ +package org.jboss.seam.faces.event; + +import javax.enterprise.inject.spi.BeanManager; +import javax.inject.Inject; + +import org.jboss.weld.Container; + +public class GenericEventListener +{ + @Inject BeanManager beanManager; + + protected BeanManager getBeanManager() + { + return beanManager != null ? beanManager : Container.instance().deploymentManager(); + } +} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/PhaseEventListener.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/PhaseEventListener.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/PhaseEventListener.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,100 @@ +package org.jboss.seam.faces.event; + +import java.lang.annotation.Annotation; + +import javax.enterprise.util.AnnotationLiteral; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +import org.jboss.seam.faces.event.qualifier.After; +import org.jboss.seam.faces.event.qualifier.ApplyRequestValues; +import org.jboss.seam.faces.event.qualifier.Before; +import org.jboss.seam.faces.event.qualifier.InvokeApplication; +import org.jboss.seam.faces.event.qualifier.ProcessValidations; +import org.jboss.seam.faces.event.qualifier.RenderResponse; +import org.jboss.seam.faces.event.qualifier.RestoreView; +import org.jboss.seam.faces.event.qualifier.UpdateModelValues; + +public class PhaseEventListener extends GenericEventListener implements PhaseListener +{ + private static final long serialVersionUID = 1L; + + private enum When + { + BEFORE, AFTER + }; + + @SuppressWarnings("serial") + private void handlePhase(When when, PhaseEvent e) + { + Annotation whenAnnotation = null; + Annotation phaseAnnotation = null; + switch (when) + { + case BEFORE: + whenAnnotation = new AnnotationLiteral<Before>() + { + }; + break; + case AFTER: + whenAnnotation = new AnnotationLiteral<After>() + { + }; + break; + } + if (e.getPhaseId() == PhaseId.APPLY_REQUEST_VALUES) + { + phaseAnnotation = new AnnotationLiteral<ApplyRequestValues>() + { + }; + } + else if (e.getPhaseId() == PhaseId.INVOKE_APPLICATION) + { + phaseAnnotation = new AnnotationLiteral<InvokeApplication>() + { + }; + } + else if (e.getPhaseId() == PhaseId.PROCESS_VALIDATIONS) + { + phaseAnnotation = new AnnotationLiteral<ProcessValidations>() + { + }; + } + else if (e.getPhaseId() == PhaseId.RENDER_RESPONSE) + { + phaseAnnotation = new AnnotationLiteral<RenderResponse>() + { + }; + } + else if (e.getPhaseId() == PhaseId.RESTORE_VIEW) + { + phaseAnnotation = new AnnotationLiteral<RestoreView>() + { + }; + } + else if (e.getPhaseId() == PhaseId.UPDATE_MODEL_VALUES) + { + phaseAnnotation = new AnnotationLiteral<UpdateModelValues>() + { + }; + } + getBeanManager().fireEvent(e, new Annotation[] { whenAnnotation, phaseAnnotation }); + } + + public void afterPhase(PhaseEvent e) + { + handlePhase(When.AFTER, e); + } + + public void beforePhase(PhaseEvent e) + { + handlePhase(When.BEFORE, e); + } + + public PhaseId getPhaseId() + { + return PhaseId.ANY_PHASE; + } + +} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/SystemEventListener.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/SystemEventListener.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/SystemEventListener.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,66 @@ +package org.jboss.seam.faces.event; + +import java.lang.annotation.Annotation; + +import javax.enterprise.util.AnnotationLiteral; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.ComponentSystemEvent; +import javax.faces.event.ExceptionQueuedEvent; +import javax.faces.event.PostConstructApplicationEvent; +import javax.faces.event.PostConstructCustomScopeEvent; +import javax.faces.event.PreDestroyApplicationEvent; +import javax.faces.event.PreDestroyCustomScopeEvent; +import javax.faces.event.SystemEvent; + +public class SystemEventListener extends GenericEventListener implements javax.faces.event.SystemEventListener +{ + public boolean isListenerForSource(Object source) + { + return true; + } + + @SuppressWarnings("serial") + public void processEvent(SystemEvent e) throws AbortProcessingException + { + Object payload = e.getClass().cast(e); + Annotation qualifier = null; + if (e instanceof ComponentSystemEvent) + { + qualifier = new AnnotationLiteral<org.jboss.seam.faces.event.qualifier.ComponentSystemEvent>() + { + }; + } + else if (e instanceof ExceptionQueuedEvent) + { + qualifier = new AnnotationLiteral<org.jboss.seam.faces.event.qualifier.ExceptionQueuedEvent>() + { + }; + } + else if (e instanceof PostConstructApplicationEvent) + { + qualifier = new AnnotationLiteral<org.jboss.seam.faces.event.qualifier.PostConstructApplicationEvent>() + { + }; + } + else if (e instanceof PostConstructCustomScopeEvent) + { + qualifier = new AnnotationLiteral<org.jboss.seam.faces.event.qualifier.PostConstructCustomScopeEvent>() + { + }; + } + else if (e instanceof PreDestroyApplicationEvent) + { + qualifier = new AnnotationLiteral<org.jboss.seam.faces.event.qualifier.PreDestroyApplicationEvent>() + { + }; + } + else if (e instanceof PreDestroyCustomScopeEvent) + { + qualifier = new AnnotationLiteral<org.jboss.seam.faces.event.qualifier.PreDestroyCustomScopeEvent>() + { + }; + } + getBeanManager().fireEvent(payload, qualifier); + } + +} Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/After.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/After.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/After.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface After {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ApplyRequestValues.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ApplyRequestValues.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ApplyRequestValues.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface ApplyRequestValues {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/Before.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/Before.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/Before.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface Before {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ComponentSystemEvent.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ComponentSystemEvent.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ComponentSystemEvent.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface ComponentSystemEvent {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ExceptionQueuedEvent.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ExceptionQueuedEvent.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ExceptionQueuedEvent.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface ExceptionQueuedEvent {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/InvokeApplication.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/InvokeApplication.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/InvokeApplication.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface InvokeApplication {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructApplicationEvent.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructApplicationEvent.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructApplicationEvent.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface PostConstructApplicationEvent {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructCustomScopeEvent.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructCustomScopeEvent.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PostConstructCustomScopeEvent.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface PostConstructCustomScopeEvent {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyApplicationEvent.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyApplicationEvent.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyApplicationEvent.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface PreDestroyApplicationEvent {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyCustomScopeEvent.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyCustomScopeEvent.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/PreDestroyCustomScopeEvent.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface PreDestroyCustomScopeEvent {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ProcessValidations.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ProcessValidations.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/ProcessValidations.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface ProcessValidations {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RenderResponse.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RenderResponse.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RenderResponse.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface RenderResponse {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RestoreView.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RestoreView.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/RestoreView.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface RestoreView {} \ No newline at end of file Added: modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/UpdateModelValues.java =================================================================== --- modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/UpdateModelValues.java (rev 0) +++ modules/faces/trunk/src/main/java/org/jboss/seam/faces/event/qualifier/UpdateModelValues.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,15 @@ +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; + +@Qualifier +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +public @interface UpdateModelValues {} \ No newline at end of file Added: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/Observer.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,28 @@ +package org.jboss.seam.faces.event; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; +import javax.faces.event.PhaseEvent; + +import org.jboss.seam.faces.event.qualifier.After; +import org.jboss.seam.faces.event.qualifier.Before; +import org.jboss.seam.faces.event.qualifier.RenderResponse; + +@ApplicationScoped +public class Observer +{ + public static boolean observeBeforeRenderResponse; + public static boolean observeAfterRenderResponse; + + public void observeBeforeRenderResponse(@Observes @Before @RenderResponse PhaseEvent e) + { + Observer.observeBeforeRenderResponse = true; + } + + public void observeAfterRenderResponse(@Observes @After @RenderResponse PhaseEvent e) + { + Observer.observeAfterRenderResponse = true; + } + +} + Added: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/PhaseListenerTests.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,49 @@ +package org.jboss.seam.faces.event; + +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.inject.Inject; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.testng.Arquillian; +import org.jboss.shrinkwrap.api.ArchivePaths; +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.lifecycle.MockLifecycle; +import org.testng.annotations.Test; + +@Test +public class PhaseListenerTests extends Arquillian +{ + + @Deployment + public static JavaArchive createTestArchive() + { + return Archives.create("test.jar", JavaArchive.class) + .addClasses(Observer.class, PhaseEventListener.class, GenericEventListener.class) + .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")); + } + + @Inject PhaseEventListener phaseEventListener; + @Inject Observer observer; + + MockFacesEnvironment environment = MockFacesEnvironment.createEnvironment(); + MockLifecycle lifecycle = new MockLifecycle(); + + @Test + public void testBeforeRenderResponse() + { + phaseEventListener.beforePhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); + assert observer.observeBeforeRenderResponse; + } + + @Test + public void testAfterRenderResponse() + { + phaseEventListener.afterPhase(new PhaseEvent(environment.getFacesContext(), PhaseId.RENDER_RESPONSE, lifecycle)); + assert observer.observeAfterRenderResponse; + } + +} Added: modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java =================================================================== --- modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java (rev 0) +++ modules/faces/trunk/src/test/java/org/jboss/seam/faces/event/SystemEventListenerTests.java 2010-03-17 10:47:07 UTC (rev 12206) @@ -0,0 +1,6 @@ +package org.jboss.seam.faces.event; + +public class SystemEventListenerTests +{ + +}

14 years, 2 months

1
0
0 / 0

Seam SVN: r12205 - branches/community/Seam_2_2/seam-gen/icefaces/build-scripts.

by seam-commits＠lists.jboss.org

Author: mgencur(a)redhat.com Date: 2010-03-16 10:23:35 -0400 (Tue, 16 Mar 2010) New Revision: 12205 Modified: branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-war.list Log: JBSEAM-4600 jboss-seam-resteasy.jar marked as not to bundle with icefaces seam-gen project Modified: branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list =================================================================== --- branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list 2010-03-16 13:10:58 UTC (rev 12204) +++ branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-ear-war.list 2010-03-16 14:23:35 UTC (rev 12205) @@ -1,2 +1,13 @@ commons-beanutils.jar -jboss-seam-*.jar +jboss-seam-debug.jar +jboss-seam-excel.jar +jboss-seam-ioc.jar +jboss-seam-mail.jar +jboss-seam-pdf.jar +jboss-seam-remoting.jar +jboss-seam-rss.jar +jboss-seam-flex.jar +jboss-seam-jul.jar +jboss-seam-ui.jar +jboss-seam-wicket-ant.jar +jboss-seam-wicket.jar Modified: branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-war.list =================================================================== --- branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2010-03-16 13:10:58 UTC (rev 12204) +++ branches/community/Seam_2_2/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2010-03-16 14:23:35 UTC (rev 12205) @@ -15,6 +15,17 @@ janino.jar jboss-el.jar jboss-seam.jar -jboss-seam-*.jar +jboss-seam-debug.jar +jboss-seam-excel.jar +jboss-seam-ioc.jar +jboss-seam-mail.jar +jboss-seam-pdf.jar +jboss-seam-remoting.jar +jboss-seam-rss.jar +jboss-seam-flex.jar +jboss-seam-jul.jar +jboss-seam-ui.jar +jboss-seam-wicket-ant.jar +jboss-seam-wicket.jar jbpm-jpdl.jar mvel2.jar

14 years, 2 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