March 2012 - seam-commits - Jboss List Archives

Seam SVN: r14396 - branches/community/Seam_2_3.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:43:53 -0400 (Wed, 14 Mar 2012) New Revision: 14396 Modified: branches/community/Seam_2_3/.gitignore Log: added *.log into .gitignore Modified: branches/community/Seam_2_3/.gitignore =================================================================== --- branches/community/Seam_2_3/.gitignore 2012-03-14 17:43:45 UTC (rev 14395) +++ branches/community/Seam_2_3/.gitignore 2012-03-14 17:43:53 UTC (rev 14396) @@ -10,6 +10,7 @@ # maven build results target test-output +*.log #eclipse output bin

14 years

1
0
0 / 0

Seam SVN: r14395 - in branches/community/Seam_2_3/examples-ee6/todo/todo-tests: src/test/java/org/jboss/seam/example/todo/test and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:43:45 -0400 (Wed, 14 Mar 2012) New Revision: 14395 Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java Log: fixed integration - tests disable its skipping Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-03-14 17:43:07 UTC (rev 14394) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-03-14 17:43:45 UTC (rev 14395) @@ -77,70 +77,46 @@ <directory>src/test/resources-integration</directory> <filtering>false</filtering> </testResource> + <testResource> + <directory>${basedir}/../todo-ear/src/main/application</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>${basedir}/../todo-web/src/main/resources</directory> + <filtering>true</filtering> + </testResource> </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-seam-bootstrap</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <includes>bootstrap/**</includes> - <artifactItems> - <artifactItem> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-embedded-bootstrap</artifactId> - <version>${project.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> + </build> <profiles> - <profile> - <id>integration-tests</id> - <activation> - <property> - <name>arquillian</name> - </property> - </activation> - </profile> - <profile> - <id>arq-jbossas-7-managed</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-managed-7</value> - </property> - </activation> - <build> - <plugins> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <build> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> </plugin> - </plugins> - - </build> - </profile> + </plugins> + </build> + </profile> + <profile> <id>arq-jbossas-7-remote</id> <activation> @@ -149,7 +125,8 @@ <value>jbossas-remote-7</value> </property> </activation> - </profile> + </profile> + <profile> <id>ftest-jbossas</id> <properties> Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java 2012-03-14 17:43:07 UTC (rev 14394) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java 2012-03-14 17:43:45 UTC (rev 14395) @@ -16,8 +16,8 @@ import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jbpm.taskmgmt.exe.TaskInstance; +import org.junit.Test; import org.junit.runner.RunWith; -import org.testng.annotations.Test; @RunWith(Arquillian.class) public class TodoTest extends JUnitSeamTest

14 years

1
0
0 / 0

Seam SVN: r14394 - in branches/community/Seam_2_3/examples-ee6: todo and 35 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:43:07 -0400 (Wed, 14 Mar 2012) New Revision: 14394 Added: branches/community/Seam_2_3/examples-ee6/todo/ branches/community/Seam_2_3/examples-ee6/todo/pom.xml branches/community/Seam_2_3/examples-ee6/todo/readme.txt branches/community/Seam_2_3/examples-ee6/todo/todo-ear/ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/.gpd.todo.jpdl.xml branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/META-INF/ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/Login.java branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/TodoList.java branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/jbpm.cfg.xml branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/todo.jpdl.xml branches/community/Seam_2_3/examples-ee6/todo/todo-tests/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/selenium/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/selenium/SeleniumTodoTest.java branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/WEB-INF/ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/todo/todo-web/ branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/login.jsp branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp Modified: branches/community/Seam_2_3/examples-ee6/pom.xml Log: added todo example in EE6 variant JBSEAM-4852 Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:41:32 UTC (rev 14393) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -8,7 +8,6 @@ <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> - <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> <packaging>pom</packaging> @@ -19,6 +18,7 @@ <module>booking</module> <module>mail</module> <module>messages</module> + <module>todo</module> </modules> <build> @@ -55,6 +55,19 @@ </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>7.1.0.Final</version> + <executions> + <execution> + <phase></phase> + <goals> + <goal>deploy</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> </build> Added: branches/community/Seam_2_3/examples-ee6/todo/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/pom.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>todo</artifactId> + + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>examples-ee6</artifactId> + <version>2.3.0.Beta1-SNAPSHOT</version> + </parent> + + <packaging>pom</packaging> + <name>Todo Example</name> + + <properties> + <example.name>todo</example.name> + </properties> + + <modules> + <module>todo-ejb</module> + <module>todo-web</module> + <module>todo-ear</module> + <module>todo-tests</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ear</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> +</project> Added: branches/community/Seam_2_3/examples-ee6/todo/readme.txt =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/readme.txt 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,29 @@ +Seam Todo List Example +====================== + +This is a simple example for the Seam tutorial, demonstrating the +use of jBPM-based business process management. + +To deploy the example to JBoss AS, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* In the tasks-ear directory run: + + mvn jboss:hard-deploy + +* Open this URL in a web browser: http://localhost:8080/seam-todo + +To deploy the example to Tomcat with Embedded JBoss, follow these steps: + +* In the example root directory run: + + mvn clean package -Ptomcat + +* Deploy the resulting war from todo-web/target directory to Tomcat manually + +* Open this URL in a web browser: http://localhost:8080/jboss-seam-todo Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/pom.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>todo</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ear</artifactId> + <packaging>ear</packaging> + <name>Todo EAR Module</name> + + <properties> + <jboss.home>${env.JBOSS_HOME}</jboss.home> + <jboss.domain>default</jboss.domain> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ejb</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> + <exclusion> + <groupId>xpp3</groupId> + <artifactId>xpp3_min</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + + <build> + <finalName>seam-todo</finalName> + <plugins> + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <version>6</version> + <defaultLibBundleDir>lib</defaultLibBundleDir> +  + <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> + <filtering>true</filtering> + <modules> + <webModule> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-web</artifactId> + <contextRoot>/seam-todo</contextRoot> + <bundleFileName>todo-web.war</bundleFileName> + </webModule> + <ejbModule> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ejb</artifactId> + <bundleFileName>todo-ejb.jar</bundleFileName> + </ejbModule> + </modules> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <executions> + <execution> + <phase></phase> + <goals> + <goal>deploy</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>exploded</id> + <properties> + <example.name>todo</example.name> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ear</artifactId> + <type>ear</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-web</artifactId> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ejb</artifactId> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/.gpd.todo.jpdl.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/.gpd.todo.jpdl.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/.gpd.todo.jpdl.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process-diagram name="todo" width="752" height="547"> + <node name="start" x="115" y="51" width="140" height="40"> + <transition> + <label x="5" y="-10"/> + </transition> + </node> + <node name="todo" x="114" y="168" width="140" height="40"> + <transition> + <label x="5" y="-10"/> + </transition> + </node> + <node name="done" x="113" y="295" width="140" height="40"/> +</process-diagram> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,14 @@ +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> + <deployment> + <dependencies> + <module name="org.dom4j" export="true"/> + <module name="javax.faces.api" export="true"/> + <module name="com.sun.jsf-impl" export="true"/> + <module name="org.javassist" export="true"/> + <module name="org.hibernate" export="true"/> + <module name="org.hibernate.envers" export="true"/> + <module name="org.apache.commons.logging" export="true"/> + <module name="org.apache.commons.collections" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>todo</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ejb</artifactId> + <packaging>ejb</packaging> + <name>Todo EJB Module</name> + + <build> + <plugins> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-resource</id> + <phase>generate-resources</phase> + <goals> + <goal>add-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${basedir}/../todo-ear/src/main/application</directory> + <targetPath>${build.output.directory}</targetPath> + <includes> + <include>**/todo.jpdl.xml</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>tomcat</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ejb-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-resource</id> + <phase>generate-resources</phase> + <goals> + <goal>add-resource</goal> + </goals> + <configuration> + <resources> + <resource> + <directory>${basedir}/../todo-ear/src/main/application</directory> + <targetPath>${build.output.directory}</targetPath> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/Login.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/Login.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/Login.java 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,28 @@ +package org.jboss.seam.example.todo; + +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.bpm.Actor; + +@Name("login") +public class Login +{ + + @In private Actor actor; + + private String user; + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String login() + { + actor.setId(user); + return "/todo.jsp"; + } +} Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/TodoList.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/TodoList.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/java/org/jboss/seam/example/todo/TodoList.java 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,29 @@ +package org.jboss.seam.example.todo; + +import org.jboss.seam.annotations.bpm.CreateProcess; +import org.jboss.seam.annotations.bpm.EndTask; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.bpm.StartTask; + +@Name("todoList") +public class TodoList +{ + + private String description; + + public String getDescription() + { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @CreateProcess(definition="todo") + public void createTodo() {} + + @StartTask @EndTask + public void done() {} + +} Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/hibernate.cfg.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/hibernate.cfg.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,170 @@ +<?xml version='1.0' encoding='utf-8'?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://www.hibernate.org/dtd//hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="show_sql">true</property> + <property name="connection.datasource">java:/jboss/datasources/ExampleDS</property> + <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + + <property name="hbm2ddl.auto">create-drop</property> +  + +  +  +  + +  +  +  +  +  + <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + +  +  +  +  +  +  +  + +  +  +  + + +  +  +  + +  + <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> + <mapping resource="org/jbpm/db/hibernate.types.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> + <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> + +  + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> + <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> + +  + <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> + +  + <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> + +  + <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> + +  + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> + +  + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> + +  + <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/job/Job.hbm.xml"/> + <mapping resource="org/jbpm/job/Timer.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + +  + <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + +  + <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> + + </session-factory> +</hibernate-configuration> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/jbpm.cfg.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/jbpm.cfg.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/jbpm.cfg.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,18 @@ +<jbpm-configuration> + + <jbpm-context> + <service name="persistence"> + <factory> + <bean class="org.jbpm.persistence.db.DbPersistenceServiceFactory"> + <field name="isTransactionEnabled"><false/></field> + </bean> + </factory> + </service> + <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> + <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> + <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> + <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> + <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" /> + </jbpm-context> + +</jbpm-configuration> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/todo.jpdl.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/todo.jpdl.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/src/main/resources/todo.jpdl.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,21 @@ +<process-definition + name="todo" + xmlns="urn:jbpm.org:jpdl-3.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd" + > + + <start-state name="start"> + <transition to="todo"/> + </start-state> + + <task-node name="todo"> + <task name="todo" description="#{todoList.description}"> + <assignment actor-id="#{actor.id}"/> + </task> + <transition to="done"/> + </task-node> + + <end-state name="done"/> + +</process-definition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,210 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>todo</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-tests</artifactId> + <name>Todo Integration Tests Module</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ejb</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + + + + + + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.server</groupId> + <artifactId>selenium-server</artifactId> + <classifier>standalone</classifier> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>functional-tests</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + <filtering>false</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-seam-bootstrap</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <includes>bootstrap/**</includes> + <artifactItems> + <artifactItem> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-embedded-bootstrap</artifactId> + <version>${project.version}</version> + <type>jar</type> + <overWrite>false</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + + </build> + </profile> + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + <profile> + <id>ftest-jbossas</id> + <properties> + <example.context.path>seam-todo</example.context.path> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>${basedir}/../todo-ear/target/seam-todo.ear</param> + </fileNames> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>ftest-tomcat</id> + <properties> + <example.context.path>jboss-seam-todo</example.context.path> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>failsafe-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/TodoTest.java 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,116 @@ +//$Id: TodoTest.java 5299 2007-06-20 00:16:21Z gavin $ +package org.jboss.seam.example.todo.test; + +import java.io.File; +import java.util.List; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.bpm.Actor; +import org.jboss.seam.bpm.TaskInstanceList; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jbpm.taskmgmt.exe.TaskInstance; +import org.junit.runner.RunWith; +import org.testng.annotations.Test; + +(a)RunWith(Arquillian.class) +public class TodoTest extends JUnitSeamTest +{ + @Deployment(name = "TodoTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-todo.ear").importFrom(new File("../todo-ear/target/seam-todo.ear")).as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "todo-web.war"); + web.addClasses(TodoTest.class); + return er; + } + + private long taskId; + + @Test + public void testTodo() throws Exception + { + + new FacesRequest() { + + @Override + protected void updateModelValues() throws Exception + { + setValue("#{login.user}", "gavin"); + } + + @Override + protected void invokeApplication() throws Exception + { + assert invokeMethod("#{login.login}").equals("/todo.jsp"); + assert Actor.instance().getId().equals("gavin"); + } + + @Override + protected void renderResponse() throws Exception + { + assert ( (List) getInstance(TaskInstanceList.class) ).size()==0; + } + + }.run(); + + new FacesRequest() + { + + @Override + protected void updateModelValues() throws Exception + { + setValue("#{todoList.description}", "Kick Roy out of my office"); + } + + @Override + protected void invokeApplication() throws Exception + { + invokeMethod("#{todoList.createTodo}"); + } + + @Override + protected void renderResponse() throws Exception + { + List<TaskInstance> tasks = (List<TaskInstance>) getInstance(TaskInstanceList.class); + assert tasks.size()==1; + TaskInstance taskInstance = tasks.get(0); + assert taskInstance.getDescription().equals("Kick Roy out of my office"); + taskId = taskInstance.getId(); + } + + }.run(); + + + new FacesRequest() + { + + @Override + protected void beforeRequest() + { + setParameter("taskId", Long.toString(taskId)); + } + + @Override + protected void invokeApplication() throws Exception + { + invokeMethod("#{todoList.done}"); + } + + @Override + protected void renderResponse() throws Exception + { + assert ( (List) getInstance(TaskInstanceList.class) ).size()==0; + } + + }.run(); + } + +} Added: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/selenium/SeleniumTodoTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/selenium/SeleniumTodoTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/java/org/jboss/seam/example/todo/test/selenium/SeleniumTodoTest.java 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.example.todo.test.selenium; + +import java.text.MessageFormat; + +import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import static org.testng.AssertJUnit.assertTrue; +import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertEquals; + +/** + * This is a base class for todo example selenium tests + * @author Jozef Hartinger + * + */ +public class SeleniumTodoTest extends SeamSeleniumTest +{ + + public static final String LOGIN_URL = "/login.seam"; + public static final String TODO_URL = "/todo.seam"; + public static final String LOGIN_USERNAME = "id=login:username"; + public static final String LOGIN_SUBMIT = "id=login:submit"; + public static final String NEW_ITEM_DESCRIPTION = "id=new:description"; + public static final String NEW_ITEM_CREATE = "id=new:create"; + + public static final String NO_ITEMS_FOUND = "id=list:noItems"; + public static final String FIRST_ITEM_DESCRIPTION = "id=list:items:0:description"; + public static final String FIRST_ITEM_PRIORITY = "id=list:items:0:priority"; + public static final String FIRST_ITEM_DONE = "id=list:items:0:done"; + public static final String NTH_ITEM_DESCRIPTION = "id=list:items:{0}:description"; + public static final String NTH_ITEM_PRIORITY = "id=list:items:{0}:priority"; + public static final String NTH_ITEM_DONE = "id=list:items:{0}:done"; + public static final String ITEMS_COUNT = "//table[@id=\"list:items\"]/tbody/tr"; + public static final String ITEMS_UPDATE = "list:update"; + + + public static final String DEFAULT_USERNAME = "tester"; + + @BeforeClass + public void prepareTestFixture() { + String[] fixture = {"selenium test for todo example", "buy milk", "clean the bathroom"}; + setUp(); + assertTrue("Item list should be empty", browser.isElementPresent(NO_ITEMS_FOUND)); + for (String item : fixture) { + browser.type(NEW_ITEM_DESCRIPTION, item); + browser.clickAndWait(NEW_ITEM_CREATE); + } + assertEquals("Unexpected count of items.", fixture.length, browser.getXpathCount(ITEMS_COUNT)); + super.tearDown(); + } + + @BeforeMethod + @Override + public void setUp() { + super.setUp(); + browser.open(CONTEXT_PATH + LOGIN_URL); + browser.type(LOGIN_USERNAME, DEFAULT_USERNAME); + browser.clickAndWait(LOGIN_SUBMIT); + assertTrue("Navigation failure. Todo page expected.", browser.getLocation().contains(TODO_URL)); + } + + @Test + public void getEntryDoneTest() { + String description = browser.getValue(FIRST_ITEM_DESCRIPTION); + int itemCount = browser.getXpathCount(ITEMS_COUNT).intValue(); + browser.clickAndWait(FIRST_ITEM_DONE); + assertFalse("Item should disappear from item list when done.", browser.isTextPresent(description)); + assertEquals("Unexpected count of items.", --itemCount, browser.getXpathCount(ITEMS_COUNT)); + } + + /** + * This test sets high priority to first item and verifies that the item is be moved to the bottom and the priority number is kept. + */ + @Test + public void priorityTest() { + String description = browser.getValue(FIRST_ITEM_DESCRIPTION); + String priority = "10"; + int itemCount = browser.getXpathCount(ITEMS_COUNT).intValue(); + int lastItemRowId = itemCount - 1; + browser.type(FIRST_ITEM_PRIORITY, priority); + browser.clickAndWait(ITEMS_UPDATE); + assertEquals("Message should move to the end of item list after priority change.", description, browser.getValue(MessageFormat.format(NTH_ITEM_DESCRIPTION, lastItemRowId))); + assertEquals("Unexpected priority.", priority, browser.getValue(MessageFormat.format(NTH_ITEM_PRIORITY, lastItemRowId))); + } +} Added: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/WEB-INF/components.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:bpm="http://jboss.com/products/seam/bpm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation= + "http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + <bpm:jbpm> + <bpm:process-definitions> + <value>todo.jpdl.xml</value> + </bpm:process-definitions> + </bpm:jbpm> + +</components> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-ftest/testng.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,30 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Todo example" verbose="2" parallel="false"> + <test name="todo_jboss5"> + <parameter name="PROPERTY_FILE" value="" /> + <classes> + <class name="org.jboss.seam.example.todo.test.selenium.SeleniumTodoTest" /> + </classes> + </test> +</suite> Property changes on: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-ftest/testng.xml ___________________________________________________________________ Added: svn:executable + * Added: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/src/test/resources-integration/arquillian.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + <property name="serverConfig">standalone-full.xml</property> + </configuration> + </container> + +</arquillian> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-web/pom.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>todo</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-web</artifactId> + <packaging>war</packaging> + <name>Todo Web Module</name> + + <properties> +  + <jndiPattern>seam-todo/#{ejbName}/local</jndiPattern> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.todo</groupId> + <artifactId>todo-ejb</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jul</artifactId> + </exclusion> + <exclusion> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp</directory> + <filtering>true</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>tomcat</id> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>todo-ejb</artifactId> + <type>ejb</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> + <exclusion> + <groupId>xpp3</groupId> + <artifactId>xpp3_min</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + </dependency> + </dependencies> + <build> + <finalName>jboss-seam-todo</finalName> + </build> + </profile> + </profiles> + +</project> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/components.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:bpm="http://jboss.com/products/seam/bpm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation= + "http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + <bpm:jbpm> + <bpm:process-definitions> + <value>todo.jpdl.xml</value> + </bpm:process-definitions> + </bpm:jbpm> + +  + <component class="org.jboss.seam.transaction.EjbSynchronizations" jndi-name="java:app/jboss-seam/EjbSynchronizations"/> + <component class="org.jboss.seam.async.TimerServiceDispatcher" jndi-name="java:app/jboss-seam/TimerServiceDispatcher"/> +</components> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/WEB-INF/web.xml 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/index.html 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=login.seam"> +</head> +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/login.jsp =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/login.jsp (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/login.jsp 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,18 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<html> +<head> +<title>Login</title> +</head> +<body> +<h1>Login</h1> +<f:view> + <h:form id="login"> + <div> + <h:inputText id="username" value="#{login.user}"/> + <h:commandButton id="submit" value="Login" action="#{login.login}"/> + </div> + </h:form> +</f:view> +</body> +</html> Added: branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp (rev 0) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp 2012-03-14 17:43:07 UTC (rev 14394) @@ -0,0 +1,63 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://jboss.com/products/seam/taglib" prefix="s"%> +<html> +<head> +<title>Todo List</title> +</head> +<body> +<h1>Todo List</h1> +<f:view> + <h:form id="list"> + <div> + <h:outputText id="noItems" value="There are no todo items." rendered="#{empty taskInstancePriorityList}"/> + <h:dataTable id="items" value="#{taskInstancePriorityList}" var="task" rendered="#{not empty taskInstancePriorityList}"> + <h:column> + <f:facet name="header"> + <h:outputText value="Description"/> + </f:facet> + <h:inputText id="description" value="#{task.description}" style="width: 400"/> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Created"/> + </f:facet> + <h:outputText value="#{task.taskMgmtInstance.processInstance.start}"> + <s:convertDateTime type="date"/> + </h:outputText> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Priority"/> + </f:facet> + <h:inputText id="priority" value="#{task.priority}" style="width: 30"/> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Due Date"/> + </f:facet> + <h:inputText id="dueDate" value="#{task.dueDate}" style="width: 100"> + <s:convertDateTime type="date" dateStyle="short"/> + </h:inputText> + </h:column> + <h:column> + <s:button id="done" action="#{todoList.done}" taskInstance="#{task}" value="Done"/> + </h:column> + </h:dataTable> + </div> + <div> + <h:messages/> + </div> + <div> + <h:commandButton id="update" value="Update Items" rendered="#{not empty taskInstanceList}"/> + </div> + </h:form> + <h:form id="new"> + <div> + <h:inputText id="description" value="#{todoList.description}" style="width: 400"/> + <h:commandButton id="create" value="Create New Item" action="#{todoList.createTodo}"/> + </div> + </h:form> +</f:view> +</body> +</html>

14 years

1
0
0 / 0

Seam SVN: r14393 - in branches/community/Seam_2_3: jboss-seam-parent and 4 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:41:32 -0400 (Wed, 14 Mar 2012) New Revision: 14393 Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml branches/community/Seam_2_3/jboss-seam-ui/pom.xml branches/community/Seam_2_3/jboss-seam/pom.xml branches/community/Seam_2_3/seam-integration-tests/pom.xml branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java Log: JBSEAM-4900 upgraded jbpm3 to be compatible with Hibernate4 Modified: branches/community/Seam_2_3/jboss-seam/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) +++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:41:32 UTC (rev 14393) @@ -368,7 +368,7 @@ </dependency> <dependency> - <groupId>org.jbpm</groupId> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <optional>true</optional> </dependency> Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) +++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:41:32 UTC (rev 14393) @@ -235,13 +235,13 @@  <dependency> - <groupId>org.jbpm</groupId> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> - <version>3.2.2</version> + <version>3.2.10.SP3_seam2</version> <exclusions> <exclusion> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> + <artifactId>hibernate-core</artifactId> </exclusion> </exclusions> </dependency> Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) +++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:41:32 UTC (rev 14393) @@ -140,7 +140,7 @@ <dependency> - <groupId>org.jbpm</groupId> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <optional>true</optional> <exclusions> Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) +++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:41:32 UTC (rev 14393) @@ -63,7 +63,7 @@ <dependencies> <dependency> - <groupId>org.jbpm</groupId> + <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> </dependency> Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java 2012-03-14 17:41:01 UTC (rev 14392) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java 2012-03-14 17:41:32 UTC (rev 14393) @@ -11,7 +11,7 @@ import org.junit.Test; import org.junit.runner.RunWith; -@Ignore +//@Ignore @RunWith(Arquillian.class) public class BusinessProcessTest extends JUnitSeamTest Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2012-03-14 17:41:01 UTC (rev 14392) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2012-03-14 17:41:32 UTC (rev 14393) @@ -15,7 +15,7 @@ * @author Pete Muir * */ -@Ignore +//@Ignore @RunWith(Arquillian.class) public class SeamExpressionEvaluatorTest extends JUnitSeamTest {

14 years

1
0
0 / 0

Seam SVN: r14392 - in branches/community/Seam_2_3: examples and 31 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:41:01 -0400 (Wed, 14 Mar 2012) New Revision: 14392 Removed: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java Modified: branches/community/Seam_2_3/distribution/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml branches/community/Seam_2_3/examples-ee6/pom.xml branches/community/Seam_2_3/examples/pom.xml branches/community/Seam_2_3/jboss-seam-debug/pom.xml branches/community/Seam_2_3/jboss-seam-excel/pom.xml branches/community/Seam_2_3/jboss-seam-flex/pom.xml branches/community/Seam_2_3/jboss-seam-gen/pom.xml branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java branches/community/Seam_2_3/jboss-seam-mail/pom.xml branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java branches/community/Seam_2_3/jboss-seam-parent/pom.xml branches/community/Seam_2_3/jboss-seam-pdf/pom.xml branches/community/Seam_2_3/jboss-seam-remoting/pom.xml branches/community/Seam_2_3/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java branches/community/Seam_2_3/jboss-seam-rss/pom.xml branches/community/Seam_2_3/jboss-seam-ui/pom.xml branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/ModelValidator.java branches/community/Seam_2_3/jboss-seam/pom.xml branches/community/Seam_2_3/seam-integration-tests/pom.xml branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java Log: refactored ee6 artifacts into standard Seam modules refactored ee6 artifacts into standard Seam modules Modified: branches/community/Seam_2_3/distribution/pom.xml =================================================================== --- branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -26,8 +26,7 @@ <configuration> <finalName>jboss-seam-${project.version}</finalName> <descriptors> -  - <descriptor>src/main/assembly/${assembly-config}</descriptor> + <descriptor>src/main/assembly/dist.xml</descriptor> </descriptors> <appendAssemblyId>true</appendAssemblyId> </configuration> @@ -264,67 +263,25 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>examples</artifactId> + <classifier>project</classifier> + <version>${project.version}</version> + <type>zip</type> + </dependency> </dependencies> - - <profiles> - <profile> - <id>jsf2</id> - <properties> - <assembly-config>dist-jsf2.xml</assembly-config> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug-jsf2</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>examples-ee6</artifactId> - <classifier>project</classifier> - <version>${project.version}</version> - <type>zip</type> - </dependency> - </dependencies> - </profile> - - <profile> - <id>jsf12</id> - <properties> - <assembly-config>dist-jsf12.xml</assembly-config> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> - <classifier>project</classifier> - <version>${project.version}</version> - <type>zip</type> - </dependency> - </dependencies> - </profile> - -</profiles> - </project> Modified: branches/community/Seam_2_3/examples/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -146,19 +146,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <version>${project.version}</version> - <type>ejb</type> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>${jsf.version}</version> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>compile</scope> <exclusions> @@ -126,7 +126,7 @@ </ejbModule> <ejbModule> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <bundleFileName>jboss-seam.jar</bundleFileName> </ejbModule> </modules> @@ -135,7 +135,7 @@ <plugin> <groupId>org.jboss.as.plugins</groupId> <artifactId>jboss-as-maven-plugin</artifactId> - <version>7.1.0.CR1b</version> + <version>7.1.0.Final</version> <executions>  Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -38,7 +38,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> </dependency> <dependency> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -21,7 +21,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> </dependency> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -28,7 +28,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> + <artifactId>jboss-seam-ui</artifactId> <exclusions> <exclusion> <groupId>org.jboss.seam</groupId> @@ -38,7 +38,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug-jsf2</artifactId> + <artifactId>jboss-seam-debug</artifactId> </dependency> <dependency> <groupId>commons-beanutils</groupId> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -31,7 +31,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>compile</scope> <exclusions> @@ -76,7 +76,7 @@ <modules> <ejbModule> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <bundleFileName>jboss-seam.jar</bundleFileName> </ejbModule> <webModule> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -16,7 +16,7 @@ <dependencies> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> </dependency> <dependency> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -21,7 +21,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> </dependency> @@ -42,7 +42,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> + <artifactId>jboss-seam-ui</artifactId> <scope>test</scope> </dependency> <dependency> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -27,7 +27,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> </dependency> <dependency> @@ -54,7 +54,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> + <artifactId>jboss-seam-ui</artifactId> <exclusions> <exclusion> <groupId>org.jboss.seam</groupId> @@ -64,7 +64,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug-jsf2</artifactId> + <artifactId>jboss-seam-debug</artifactId> </dependency> <dependency> <groupId>org.jboss.seam</groupId> @@ -150,7 +150,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>compile</scope> <exclusions> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -30,7 +30,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>compile</scope> <exclusions> @@ -74,7 +74,7 @@ </ejbModule> <ejbModule> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <bundleFileName>jboss-seam.jar</bundleFileName> </ejbModule> </modules> @@ -83,7 +83,7 @@ <plugin> <groupId>org.jboss.as.plugins</groupId> <artifactId>jboss-as-maven-plugin</artifactId> - <version>7.1.0.CR1b</version> + <version>7.1.0.Final</version> <executions>  Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -15,7 +15,7 @@ <dependencies> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> </dependency> <dependency> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> </dependency> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> + <artifactId>jboss-seam-ui</artifactId> <exclusions> <exclusion> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -83,7 +83,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <version>${project.version}</version> <type>ejb</type> <scope>provided</scope> Modified: branches/community/Seam_2_3/jboss-seam/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -9,7 +9,7 @@ <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <packaging>ejb</packaging> <name>Seam Core JSF2</name> <description>Seam core module for Seam framework integrated with JSF2</description> Modified: branches/community/Seam_2_3/jboss-seam-debug/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -6,18 +6,30 @@ <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jboss-seam-debug-jsf2</artifactId> + <artifactId>jboss-seam-debug</artifactId> <name>Seam Debug for JSF2</name> <dependencies> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> </dependency> - + + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -28,11 +40,6 @@ <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> - - - - - </dependencies> <profiles> @@ -78,25 +85,6 @@ </plugins> </build> </profile> - <profile> - <id>jsf2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <optional>true</optional> - </dependency> - </dependencies> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/jboss-seam-excel/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -13,6 +13,21 @@ <name>Seam Excel</name> <dependencies> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> <dependency> <groupId>net.sourceforge.jexcelapi</groupId> <artifactId>jxl</artifactId> @@ -107,53 +122,5 @@ </plugins> </build> </profile> - <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf2</id> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <type>ejb</type> - </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> - </dependency> - </dependencies> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/jboss-seam-flex/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -91,43 +91,6 @@ </plugins> </build> </profile> - <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </dependency> - - </dependencies> - </profile> - <profile> - <id>jsf2</id> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> - </dependency> - </dependencies> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/jboss-seam-gen/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -68,7 +68,7 @@ <scope>runtime</scope> </dependency> - <dependency> +  <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> Modified: branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-ioc/src/main/java/org/jboss/seam/ioc/spring/SeamManagedSessionFactoryBean.java 2012-03-14 17:41:01 UTC (rev 14392) @@ -193,7 +193,7 @@ List<Class> interfaces = new ArrayList<Class>(Arrays.asList(ClassUtils .getAllInterfaces(session))); //Have to bend Session implementation since HiberanteSessionProxy doesn't implement classic.Session. - interfaces.add(org.hibernate.classic.Session.class); + interfaces.add(Session.class); return Proxy.newProxyInstance(this.getClass().getClassLoader(), interfaces .toArray(new Class[interfaces.size()]), new SeamManagedSessionHandler( (SessionFactory) proxy, session)); @@ -215,8 +215,8 @@ } try { - if(method.getDeclaringClass().equals(org.hibernate.classic.Session.class) && - !(delegate instanceof org.hibernate.classic.Session)) { + if(method.getDeclaringClass().equals(Session.class) && + !(delegate instanceof Session)) { throw new UnsupportedOperationException("Unable to execute method: "+method.toString()+" Seam managed session does not support classic.Session methods."); } return method.invoke(delegate, args); Modified: branches/community/Seam_2_3/jboss-seam-mail/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -19,6 +19,15 @@ <dependency> <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-pdf</artifactId> <optional>true</optional> <exclusions> @@ -51,6 +60,10 @@ <classifier>jdk15</classifier> <scope>test</scope> </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> </dependencies> <profiles> @@ -104,44 +117,6 @@ </plugins> </build> </profile> - <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </dependency> - - </dependencies> - </profile> - <profile> - <id>jsf2</id> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> - </dependency> - </dependencies> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-mail/src/test/java/org/jboss/seam/test/unit/MailTest.java 2012-03-14 17:41:01 UTC (rev 14392) @@ -1,13 +1,10 @@ package org.jboss.seam.test.unit; -import java.util.ArrayList; - import javax.mail.NoSuchProviderException; import javax.mail.Session; import javax.naming.NamingException; import org.jboss.seam.mail.MailSession; -import org.jboss.seam.mail.MeldwareUser; import org.testng.annotations.Test; import com.sun.mail.smtp.SMTPSSLTransport; @@ -367,7 +364,7 @@ assert failure; } - @Test + /*@Test public void testMeldwareUser() { MeldwareUser meldwareUser = new MeldwareUser(); @@ -394,7 +391,7 @@ assert meldwareUser.getRoles().contains("calendaruser"); assert meldwareUser.getRoles().contains("adminuser"); - } + }*/ // TODO Write tests for Meldware Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -40,7 +40,7 @@  <version.arquillian_core>1.0.0.CR7</version.arquillian_core> - <version.richfaces>3.3.3.Final</version.richfaces> + <version.richfaces>4.1.0.Final</version.richfaces> <version.wicket>1.4.14</version.wicket> <version.drools>5.0.1</version.drools> <version.testng>5.10</version.testng> @@ -49,9 +49,10 @@ <version.jbossembedded>beta3.SP15</version.jbossembedded> <version.jbossas7>7.1.0.Final</version.jbossas7> <version.emma>2.0.5312</version.emma> - <version.jsf12>1.2_12</version.jsf12> <version.jsf2>2.1.5</version.jsf2> - <version.junit>4.8.1</version.junit> + <version.junit>4.8.2</version.junit> + <version.hibernatevalidator>4.2.0.Final</version.hibernatevalidator> + <version.hcore>4.0.1.Final</version.hcore>   @@ -143,30 +144,16 @@ </exclusion> </exclusions> </dependency> +<<<<<<< HEAD + +======= +>>>>>>> 28045d7... refactored ee6 artifacts into standard Seam modules <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug-jsf2</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.jboss.seam</groupId> @@ -235,64 +222,19 @@ <version>1.7.0</version> </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>${version.richfaces}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> + + + + + - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>${version.richfaces}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> + + + + + <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>${version.richfaces}</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - - </exclusions> - </dependency> - - <dependency> <groupId>org.jbpm</groupId> <artifactId>jbpm-jpdl</artifactId> <version>3.2.2</version> @@ -434,81 +376,20 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> + <version>${version.hcore}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>3.4.0.GA</version> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> + <version>${version.hcore}</version> + </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>3.1.0.GA</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> + <version>${version.hibernatevalidator}</version> </dependency> <dependency> @@ -518,12 +399,6 @@ </dependency> <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.15.B1</version> - </dependency> - - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>1.0</version> @@ -859,18 +734,6 @@ </dependency> <dependency> - <groupId>org.buni.meldware</groupId> - <artifactId>meldware-mailjmx</artifactId> - <version>1.0M8</version> - </dependency> - - <dependency> - <groupId>org.buni.meldware</groupId> - <artifactId>meldware-mailapi</artifactId> - <version>1.0M8</version> - </dependency> - - <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> <version>${version.drools}</version> @@ -999,7 +862,7 @@ <dependency> <groupId>cglib</groupId> <artifactId>cglib-nodep</artifactId> - <version>2.1_3</version> + <version>2.2</version> </dependency> @@ -1542,31 +1405,6 @@ </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>${version.jsf12}</version> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>${version.jsf12}</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> <version>${version.jsf2}</version> @@ -1579,13 +1417,6 @@ </dependency> <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - - <dependency> <groupId>org.jboss.spec</groupId> <artifactId>jboss-javaee-6.0</artifactId> <version>1.0.0.Final</version> @@ -1671,13 +1502,6 @@ <source>${java.compiler.version}</source> <target>${java.compiler.version}</target> </configuration> - <dependencies> - - - - - - </dependencies> </plugin> <plugin> @@ -1821,6 +1645,9 @@ </build> <modules> + <module>../jboss-seam</module> + <module>../jboss-seam-ui</module> + <module>../jboss-seam-debug</module> <module>../jboss-seam-gen</module> <module>../jboss-seam-excel</module> <module>../jboss-seam-flex</module> @@ -1834,6 +1661,8 @@ <module>../jboss-seam-jul</module> <module>../jboss-embedded-bootstrap</module> <module>../functional-tests</module> + <module>../examples-ee6</module> + <module>../seam-integration-tests</module> </modules> <profiles> @@ -1874,29 +1703,6 @@ </profile> <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>../jboss-seam</module> - <module>../jboss-seam-ui</module> - <module>../jboss-seam-debug</module> - <module>../examples</module> - <module>../seam-integration-tests</module> - </modules> - </profile> - <profile> - <id>jsf2</id> - <modules> - <module>../jboss-seam-jsf2</module> - <module>../jboss-seam-ui-jsf2</module> - <module>../jboss-seam-debug-jsf2</module> - <module>../examples-ee6</module> - <module>../seam-integration-tests-ee6</module> - </modules> - </profile> - <profile> <id>code-coverage</id> <activation> <property> @@ -1938,7 +1744,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> Modified: branches/community/Seam_2_3/jboss-seam-pdf/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -44,6 +44,15 @@ <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> </dependencies> <profiles> @@ -89,44 +98,6 @@ </plugins> </build> </profile> - <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </dependency> - - </dependencies> - </profile> - <profile> - <id>jsf2</id> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> - </dependency> - </dependencies> - </profile> </profiles> Modified: branches/community/Seam_2_3/jboss-seam-remoting/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -84,6 +84,12 @@ <artifactId>jboss-el</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> </dependencies> <profiles> @@ -137,36 +143,7 @@ </plugins> </build> </profile> - <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - - </dependencies> - - </profile> - <profile> - <id>jsf2</id> - <dependencies> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <type>ejb</type> - </dependency> - - </dependencies> - - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-remoting/src/main/java/org/jboss/seam/remoting/wrapper/BagWrapper.java 2012-03-14 17:41:01 UTC (rev 14392) @@ -14,7 +14,7 @@ import java.util.Set; import org.dom4j.Element; -import org.hibernate.collection.PersistentCollection; +import org.hibernate.collection.spi.PersistentCollection; /** * Wrapper for collections, arrays, etc. Modified: branches/community/Seam_2_3/jboss-seam-rss/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -35,6 +35,11 @@ <type>ejb</type> </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -46,6 +51,10 @@ <artifactId>el-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> </dependencies> <profiles> @@ -91,44 +100,6 @@ </plugins> </build> </profile> - <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - </dependency> - - </dependencies> - </profile> - <profile> - <id>jsf2</id> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui-jsf2</artifactId> - </dependency> - </dependencies> - </profile> </profiles> </project> Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -6,16 +6,20 @@ <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> - <artifactId>jboss-seam-ui-jsf2</artifactId> + <artifactId>jboss-seam-ui</artifactId> <name>Seam UI JSF2 support</name> + <properties> + <version.richfaces>3.3.3.Final</version.richfaces> + </properties> + <build>  <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>${version.richfaces}</version> + <version>3.3.3.Final</version> <executions> <execution> <phase>generate-sources</phase> @@ -84,7 +88,7 @@ <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> + <artifactId>jboss-seam</artifactId> <type>ejb</type> </dependency> @@ -99,33 +103,36 @@ <optional>true</optional> </dependency> - <dependency> + <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> + <version>${version.richfaces}</version> <optional>true</optional> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> + <version>${version.richfaces}</version> <optional>true</optional> </dependency> <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> + <version>${version.richfaces}</version> <optional>true</optional> </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + + </dependency> + <dependency> <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - - </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> <scope>provided</scope>  @@ -148,7 +155,6 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <optional>true</optional> - <version>4.0.1.Final</version> </dependency> <dependency> @@ -162,12 +168,22 @@ <artifactId>commons-beanutils</artifactId> </dependency> - + + + + + + + + + + + + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <optional>true</optional> - <version>4.2.0.Final</version> </dependency> <dependency> Deleted: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java 2012-03-14 17:41:01 UTC (rev 14392) @@ -1,27 +0,0 @@ -package org.jboss.seam.ui.filter; - -import static org.jboss.seam.annotations.Install.FRAMEWORK; - -import javax.servlet.Filter; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Unwrap; -import org.jboss.seam.annotations.intercept.BypassInterceptors; - -@Name("org.jboss.seam.web.ajax4jsfFilterInstantiator") -@Install(precedence = FRAMEWORK, classDependencies={"org.ajax4jsf.Filter", "org.apache.commons.digester.Digester"}) -@BypassInterceptors -(a)Scope(ScopeType.STATELESS) -public class Ajax4jsfFilterInstantiator -{ - - @Unwrap - public Filter create() - { - return new org.ajax4jsf.Filter(); - } - -} Modified: branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/ModelValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/ModelValidator.java 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/jboss-seam-wicket/src/main/java/org/jboss/seam/wicket/ModelValidator.java 2012-03-14 17:41:01 UTC (rev 14392) @@ -1,13 +1,15 @@ package org.jboss.seam.wicket; +import java.util.Set; + import org.apache.wicket.model.PropertyModel; import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidationError; import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.ValidationError; -import org.hibernate.validator.ClassValidator; -import org.hibernate.validator.InvalidValue; +import org.jboss.seam.core.ClassValidator; import org.jboss.seam.core.Validators; +import javax.validation.ConstraintViolation; /** @@ -20,7 +22,7 @@ public class ModelValidator implements IValidator { - private Class clazz; + private Class<?> clazz; private String property; /** @@ -47,11 +49,13 @@ */ public void validate(IValidatable validatable) { - ClassValidator classValidator = Validators.instance().getValidator(clazz); - InvalidValue[] invalidValues = classValidator.getPotentialInvalidValues(property, validatable.getValue()); - if (invalidValues.length > 0) + ClassValidator<?> classValidator = Validators.instance().getValidator(clazz); + Set<?> invalidValues = classValidator.getPotentialInvalidValues(property, validatable.getValue()); + + if (invalidValues.size() > 0) { - String message = invalidValues[0].getMessage(); + ConstraintViolation constraintViolation = (ConstraintViolation) invalidValues.iterator().next(); + String message = constraintViolation.getMessage(); IValidationError validationError = new ValidationError().setMessage(message); validatable.error(validationError); } Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:41:01 UTC (rev 14392) @@ -8,7 +8,7 @@ <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> - <artifactId>seam-integration-tests-ee6</artifactId> + <artifactId>seam-integration-tests</artifactId> <name>Seam Integration Tests</name> <properties> @@ -110,6 +110,21 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <exclusions> + <exclusion> + <artifactId>testng</artifactId> + <groupId>org.testng</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> </dependencies> <profiles> @@ -150,7 +165,7 @@ <configuration> <sourceSets> <sourceSet> - <directory>${basedir}/../jboss-seam-jsf2/src/main/java</directory> + <directory>${basedir}/../jboss-seam/src/main/java</directory> <directory>${basedir}/../jboss-seam-debug/src/main/java</directory> <directory>${basedir}/../jboss-seam-excel/src/main/java</directory> <directory>${basedir}/../jboss-seam-flex/src/main/java</directory> @@ -174,54 +189,9 @@ </build> </profile> <profile> - <id>jsf2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <version>${project.version}</version> - - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - </build> - </profile> - - <profile> <id>integration-test</id> <activation> - <activeByDefault>true</activeByDefault> + <property> <name>arquillian</name> </property> @@ -261,7 +231,7 @@ <profile> <id>arq-jbossas-7-managed</id> <activation> - <activeByDefault>true</activeByDefault> + <property> <name>arquillian</name> <value>jbossas-managed-7</value> Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:39:25 UTC (rev 14391) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:41:01 UTC (rev 14392) @@ -35,7 +35,7 @@ .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) .configureFrom("pom.xml") .goOffline() - .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT") + .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta1-SNAPSHOT") .resolveAsFiles()); } @@ -72,7 +72,7 @@ .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) .configureFrom("pom.xml") .goOffline() - .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT") + .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta1-SNAPSHOT") .artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3-seam2") .exclusion("org.hibernate:hibernate-core") .resolveAsFiles());

14 years

1
0
0 / 0

Seam SVN: r14391 - in branches/community/Seam_2_3: seam-integration-tests/src/test and 21 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:39:25 -0400 (Wed, 14 Mar 2012) New Revision: 14391 Added: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java branches/community/Seam_2_3/seam-integration-tests/src/test/resources-jbossas-7/ branches/community/Seam_2_3/seam-integration-tests/src/test/resources-jbossas-7/arquillian.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/ejb-jar.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml Removed: branches/community/Seam_2_3/seam-integration-tests-ee6/pom.xml branches/community/Seam_2_3/seam-integration-tests-ee6/readme.txt branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Action.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanA.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanB.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConversationTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Country.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/CountryHome.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ELTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EventTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Foo.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ImportTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageContextTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageParamTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/People.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Person.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Thing.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/UnversionedThing.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/persistence.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components-jbpm.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/pages.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/web.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/components.properties branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/hibernate.cfg.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jboss-seam-integration-tests-ds.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jbpm.cfg.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/messages_en.properties branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/seam.properties branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/test-destinations-service.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess1.jpdl.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess2.jpdl.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess3.jpdl.xml branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess4.jpdl.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/ejb-jar.xml branches/community/Seam_2_3/seam-integration-tests/testng.xml Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml branches/community/Seam_2_3/seam-integration-tests/readme.txt branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Action.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BeanA.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BeanB.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Country.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/CountryHome.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ELTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EventTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Foo.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ImportTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageContextTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageParamTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/People.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Person.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Thing.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/UnversionedThing.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/persistence.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/pages.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/components.properties branches/community/Seam_2_3/seam-integration-tests/src/test/resources/hibernate.cfg.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/jboss-seam-integration-tests-ds.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/jbpm.cfg.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/messages_en.properties branches/community/Seam_2_3/seam-integration-tests/src/test/resources/seam.properties branches/community/Seam_2_3/seam-integration-tests/src/test/resources/test-destinations-service.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess1.jpdl.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess2.jpdl.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess3.jpdl.xml branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess4.jpdl.xml Log: renamed seam-integration-tests-ee6 to seam-integration-tests Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -8,7 +8,7 @@ <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> - <artifactId>seam-integration-tests</artifactId> + <artifactId>seam-integration-tests-ee6</artifactId> <name>Seam Integration Tests</name> <properties> @@ -16,25 +16,18 @@ <build> <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skipTests>false</skipTests> - <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx800m -Dfoo</argLine> - <additionalClasspathElements> - <additionalClasspathElement>${project.build.directory}/bootstrap</additionalClasspathElement> - </additionalClasspathElements> - <suiteXmlFiles> - <suiteXmlFile>testng.xml</suiteXmlFile> - </suiteXmlFiles> - </configuration> + <skipTests>true</skipTests> + </configuration> <executions> <execution> @@ -44,50 +37,25 @@ <goal>test</goal> </goals> <configuration> - <skip>false</skip> + <skip>true</skip> </configuration> </execution> </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-seam-bootstrap</id> - <phase>process-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-embedded-bootstrap</artifactId> - <version>${project.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${project.build.directory}/bootstrap</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/META-INF</directory> - </fileset> - </filesets> - </configuration> - </plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>${project.build.directory}/bootstrap</directory> + </fileset> + <fileset> + <directory>${basedir}/src/test/META-INF</directory> + </fileset> + </filesets> + </configuration> + </plugin> </plugins> @@ -95,187 +63,281 @@ <dependencies> <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>jboss-embedded-all</artifactId> - <version>${version.jbossembedded}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-deployers-core-spi</artifactId> - </exclusion> - </exclusions> + <groupId>org.jbpm</groupId> + <artifactId>jbpm-jpdl</artifactId> </dependency> + <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>thirdparty-all</artifactId> - <version>${version.jbossembedded}</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> + <dependency> - <groupId>org.jboss.seam.embedded</groupId> - <artifactId>hibernate-all</artifactId> - <version>${version.jbossembedded}</version> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> </dependency> - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-jpdl</artifactId> - </dependency> + <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> </dependency> + + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-api-maven</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-impl-maven</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <type>pom</type> + <scope>provided</scope> + </dependency> + </dependencies> - - <profiles> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>default-test</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - <executions> - <execution> - <id>merge</id> - <phase>post-integration-test</phase> - <goals> - <goal>merge</goal> - </goals> - <configuration> - <searchPath>${basedir}/../</searchPath> - </configuration> - </execution> - <execution> - <id>report</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <sourceSets> - <sourceSet> - <directory>${basedir}/../jboss-seam/src/main/java</directory> - <directory>${basedir}/../jboss-seam-debug/src/main/java</directory> - <directory>${basedir}/../jboss-seam-excel/src/main/java</directory> - <directory>${basedir}/../jboss-seam-flex/src/main/java</directory> - <directory>${basedir}/../jboss-seam-gen/src/main/java</directory> - <directory>${basedir}/../jboss-seam-ioc/src/main/java</directory> - <directory>${basedir}/../jboss-seam-jul/src/main/java</directory> - <directory>${basedir}/../jboss-seam-mail/src/main/java</directory> - <directory>${basedir}/../jboss-seam-pdf/src/main/java</directory> - <directory>${basedir}/../jboss-seam-remoting/src/main/java</directory> - <directory>${basedir}/../jboss-seam-resteasy/src/main/java</directory> - <directory>${basedir}/../jboss-seam-rss/src/main/java</directory> - <directory>${basedir}/../jboss-seam-ui/src/main/java</directory> - <directory>${basedir}/../jboss-seam-wicket/src/main/java</directory> - </sourceSet> - </sourceSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jsf12</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf2</id> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> + <profiles> + <profile> + <id>code-coverage</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <executions> + <execution> + <id>default-test</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.sonatype.maven.plugin</groupId> + <artifactId>emma4it-maven-plugin</artifactId> + <executions> + <execution> + <id>merge</id> + <phase>post-integration-test</phase> + <goals> + <goal>merge</goal> + </goals> + <configuration> + <searchPath>${basedir}/../</searchPath> + </configuration> + </execution> + <execution> + <id>report</id> + <phase>verify</phase> + <goals> + <goal>report</goal> + </goals> + <configuration> + <sourceSets> + <sourceSet> + <directory>${basedir}/../jboss-seam-jsf2/src/main/java</directory> + <directory>${basedir}/../jboss-seam-debug/src/main/java</directory> + <directory>${basedir}/../jboss-seam-excel/src/main/java</directory> + <directory>${basedir}/../jboss-seam-flex/src/main/java</directory> + <directory>${basedir}/../jboss-seam-gen/src/main/java</directory> + <directory>${basedir}/../jboss-seam-ioc/src/main/java</directory> + <directory>${basedir}/../jboss-seam-jul/src/main/java</directory> + <directory>${basedir}/../jboss-seam-mail/src/main/java</directory> + <directory>${basedir}/../jboss-seam-pdf/src/main/java</directory> + <directory>${basedir}/../jboss-seam-remoting/src/main/java</directory> + <directory>${basedir}/../jboss-seam-resteasy/src/main/java</directory> + <directory>${basedir}/../jboss-seam-rss/src/main/java</directory> + <directory>${basedir}/../jboss-seam-ui/src/main/java</directory> + <directory>${basedir}/../jboss-seam-wicket/src/main/java</directory> + </sourceSet> + </sourceSets> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jsf2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jsf2</artifactId> + <version>${project.version}</version> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + </build> + </profile> + + <profile> + <id>integration-test</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>arquillian</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + <skipTests>false</skipTests> + </configuration> + + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <skip>false</skip> + <systemProperties> +  + <version.jbossas7>${version.jbossas7}</version.jbossas7> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <directory>src/test/resources-jbossas-7</directory> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-as7</id> + <phase>process-test-classes</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-dist</artifactId> + <version>${version.jbossas7}</version> + <type>zip</type> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + </dependency> + </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <directory>src/test/resources-jbossas-7</directory> + </testResource> + </testResources> + </build> + </profile> + </profiles> </project> Property changes on: branches/community/Seam_2_3/seam-integration-tests/readme.txt ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Action.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BeanA.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BeanB.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,13 +1,28 @@ package org.jboss.seam.test.integration; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.bpm.CreateProcess; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +@Ignore +(a)RunWith(Arquillian.class) public class BusinessProcessTest - extends SeamTest + extends JUnitSeamTest { + @Deployment(name="BusinessProcessTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.jbpmSeamDeployment().addClasses(ProcessComponent.class); + } + @Test public void noProcessDefinition() throws Exception @@ -36,6 +51,7 @@ try { invokeAction("#{bpmTest.startOne}"); } catch (Exception e) { + e.printStackTrace(); assert false; } } Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -2,26 +2,27 @@ import static org.jboss.seam.ScopeType.APPLICATION; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.After; +import org.junit.runner.RunWith; public class ConcurrentFactoryTest - extends SeamTest + extends JUnitSeamTest { - @Override - protected void startJbossEmbeddedIfNecessary() - throws org.jboss.deployers.spi.DeploymentException, - java.io.IOException - { - // don't deploy - } - - @Test(threadPoolSize = 2, invocationCount = 2) + + // TODO: Implement a different way to run concurrent test for junit + // @Test(threadPoolSize = 2, invocationCount = 2) + @Test + @Ignore public void concurrentFactoryCall() throws Exception { @@ -33,7 +34,7 @@ }.run(); } - @AfterMethod + @After @Override public void end() { Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -5,17 +5,36 @@ import javax.faces.model.SelectItem; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.core.ConversationEntries; import org.jboss.seam.core.ConversationEntry; import org.jboss.seam.core.Manager; import org.jboss.seam.faces.Switcher; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) public class ConversationTest - extends SeamTest + extends JUnitSeamTest { - + @Deployment(name="ConversationTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment(); + } + @Test public void conversationStack() throws Exception @@ -28,7 +47,7 @@ assert entries.size() == 0; } }.run(); - + // no conversation, no stack new FacesRequest("/pageWithoutDescription.xhtml") { @Override @@ -39,10 +58,10 @@ @Override protected void renderResponse() throws Exception { List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 0; + assert entries.size() == 0; } }.run(); - + // new conversation, stack = 1 String rootId = new FacesRequest("/pageWithDescription.xhtml") { @Override @@ -53,10 +72,10 @@ @Override protected void renderResponse() throws Exception { List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 1; + assert entries.size() == 1; } }.run(); - + // nested conversation, stack =2 String nested1 = new FacesRequest("/pageWithDescription.xhtml", rootId) { @Override @@ -71,7 +90,7 @@ } }.run(); - + // nested conversation without description, not added to stack String nested2 = new FacesRequest("/pageWithoutDescription.xhtml", nested1) { @Override @@ -85,7 +104,7 @@ assert entries.size() == 2; } }.run(); - + // access a page, now it's on the stack new FacesRequest("/pageWithDescription.xhtml", nested2) { @Override @@ -94,7 +113,7 @@ assert entries.size() == 3; } }.run(); - + // end conversation, stack goes down new FacesRequest("/pageWithDescription.xhtml", nested2) { @Override @@ -108,7 +127,7 @@ assert entries.size() == 2; } }.run(); - + // end another one, size is 1 new FacesRequest("/pageWithDescription.xhtml", nested1) { @Override Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ConversationTest.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Country.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/CountryHome.java ___________________________________________________________________ Deleted: svn:executable - * Copied: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java (from rev 14390, branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java) =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java (rev 0) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -0,0 +1,80 @@ +package org.jboss.seam.test.integration; + +import org.jboss.seam.test.integration.bpm.SeamExpressionEvaluatorTestController; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +import org.jboss.shrinkwrap.resolver.api.DependencyResolvers; +import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver; + +public class Deployments { + public static WebArchive defaultSeamDeployment() { + return ShrinkWrap.create(WebArchive.class, "test.war") + .addAsWebInfResource(new StringAsset( + "<jboss-deployment-structure>" + + "<deployment>" + + "<dependencies>" + + "<module name=\"org.javassist\"/>" + + "<module name=\"org.dom4j\"/>" + + "</dependencies>" + + "</deployment>" + + "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") + .addAsResource("seam.properties") + .addAsResource("components.properties") + .addAsResource("messages_en.properties") + .addAsResource("META-INF/persistence.xml") + + .addAsResource("hibernate.cfg.xml") + .addAsWebInfResource("WEB-INF/components.xml", "components.xml") + .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") + .addAsWebInfResource("WEB-INF/web.xml", "web.xml") + .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") + + .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) + .configureFrom("pom.xml") + .goOffline() + .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT") + .resolveAsFiles()); + } + + public static WebArchive jbpmSeamDeployment() { + return ShrinkWrap.create(WebArchive.class, "test.war") + .addAsWebInfResource(new StringAsset( + "<jboss-deployment-structure>" + + "<deployment>" + + "<dependencies>" + + "<module name=\"org.javassist\"/>" + + "<module name=\"org.dom4j\"/>" + + "<module name=\"org.apache.commons.collections\"/>" + + "</dependencies>" + + "</deployment>" + + "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") + .addAsResource("seam.properties") + .addAsResource("components.properties") + .addAsResource("messages_en.properties") + .addAsResource("META-INF/persistence.xml") + + .addAsResource("testProcess1.jpdl.xml") + .addAsResource("testProcess2.jpdl.xml") + .addAsResource("testProcess3.jpdl.xml") + .addAsResource("testProcess4.jpdl.xml") + + .addAsResource("jbpm.cfg.xml") + + .addAsResource("hibernate.cfg.xml") + .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml") + .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") + .addAsWebInfResource("WEB-INF/web.xml", "web.xml") + .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") + + .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) + .configureFrom("pom.xml") + .goOffline() + .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT") + .artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3-seam2") + .exclusion("org.hibernate:hibernate-core") + .resolveAsFiles()); + } +} Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ELTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ELTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ELTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -4,30 +4,31 @@ import javax.faces.el.MethodBinding; import javax.faces.el.ValueBinding; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.jsf.UnifiedELMethodBinding; import org.jboss.seam.jsf.UnifiedELValueBinding; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; + /** * * @author Pete Muir * */ -public class ELTest extends SeamTest -{ - - @Override - protected void startJbossEmbeddedIfNecessary() - throws org.jboss.deployers.spi.DeploymentException ,java.io.IOException {} - +public class ELTest extends JUnitSeamTest +{ @Test public void testUnifiedELMethodBinding() throws Exception { new FacesRequest() { @SuppressWarnings("deprecation") - @Override + @Override protected void invokeApplication() throws Exception { MethodBinding methodBinding = new UnifiedELMethodBinding("#{action.go}", new Class[0]); Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ELTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -10,6 +10,9 @@ import javax.persistence.EntityManager; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; @@ -19,9 +22,11 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Conversation; -import org.jboss.seam.mock.SeamTest; +import org.jboss.seam.mock.JUnitSeamTest; import org.jboss.seam.persistence.ManagedEntityInterceptor; -import org.testng.annotations.Test; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Verifies the work of the ManagedEntityInterceptor. Specifically that @@ -34,8 +39,17 @@ * @author Norman Richards * @author Dan Allen */ -public class EntityPassivationTest extends SeamTest +(a)RunWith(Arquillian.class) +public class EntityPassivationTest extends JUnitSeamTest { + @Deployment(name="EntityPassivationTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(SomeComponent.class, NestedComponent.class, UnversionedThing.class); + } + @Test public void testEntityList() throws Exception { @@ -164,7 +178,7 @@ } }.run(); } - + @Name("entitytest.someComponent") @Scope(ScopeType.CONVERSATION) @AutoCreate @@ -228,9 +242,8 @@ thing2.setName("thing two"); entityManager.persist(thing2); } - } - + @Name("entitytest.nestedComponent") @Scope(ScopeType.CONVERSATION) @AutoCreate Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,22 +1,34 @@ package org.jboss.seam.test.integration; -import org.jboss.seam.mock.SeamTest; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.mock.JUnitSeamTest; import java.util.HashMap; import java.util.Map; import javax.persistence.EntityManager; -import org.hibernate.StaleStateException; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Manager; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class EntityTest - extends SeamTest + extends JUnitSeamTest { + @Deployment(name="EntityTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(Thing.class); + } @Test public void entityUpdatedInNestedConversation() throws Exception { @@ -108,32 +120,28 @@ } }.run(); - try { - new FacesRequest("/page.xhtml", conversation1) { - EntityExceptionObserver observer; + new FacesRequest("/page.xhtml", conversation1) { + EntityExceptionObserver observer; - @Override - protected void invokeApplication() throws Exception { - Thing thing = (Thing) Contexts.getConversationContext().get("thing"); - thing.setName("bar"); + @Override + protected void invokeApplication() throws Exception { + Thing thing = (Thing) Contexts.getConversationContext().get("thing"); + thing.setName("bar"); - observer = (EntityExceptionObserver) getValue("#{entityExceptionObserver}"); - assert observer != null; - } + observer = (EntityExceptionObserver) getValue("#{entityExceptionObserver}"); + assert observer != null; + } - @Override - protected void renderResponse() throws Exception { - Assert.fail("page rendered without redirect, expected StaleStateException!"); - } + @Override + protected void renderResponse() throws Exception { + Assert.fail("page rendered without redirect, expected StaleStateException!"); + } - @Override - protected void afterRequest() { - assert observer.getOptimisticLockExceptionSeen(); - } - }.run(); - - } catch (StaleStateException e) { - } + @Override + protected void afterRequest() { + assert observer.getOptimisticLockExceptionSeen(); + } + }.run(); } @Name("entityExceptionObserver") Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EntityTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EventTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EventTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EventTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,9 +1,14 @@ package org.jboss.seam.test.integration; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.Component; import org.jboss.seam.core.Events; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** @@ -11,8 +16,17 @@ * @author Pete Muir * */ -public class EventTest extends SeamTest { +(a)RunWith(Arquillian.class) +public class EventTest extends JUnitSeamTest { + @Deployment(name="IdentifierTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(BeanA.class, BeanB.class); + } + @Test public void testEventChain() throws Exception { Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/EventTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Foo.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Foo.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Foo.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -10,7 +10,7 @@ import javax.ejb.Remove; -import org.hibernate.validator.NotNull; +import javax.validation.constraints.NotNull; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Foo.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -3,17 +3,30 @@ import javax.persistence.EntityManager; import org.hibernate.Session; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.framework.EntityIdentifier; import org.jboss.seam.framework.HibernateEntityIdentifier; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * @author Pete Muir * */ -public class IdentifierTest extends SeamTest +(a)RunWith(Arquillian.class) +public class IdentifierTest extends JUnitSeamTest { + @Deployment(name="IdentifierTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(Country.class, CountryHome.class); + } @Test public void testEntityIdentifier() throws Exception Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ImportTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ImportTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ImportTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,32 +1,44 @@ package org.jboss.seam.test.integration; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.Import; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) public class ImportTest - extends SeamTest + extends JUnitSeamTest { - + @Deployment(name="IdentifierTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(Importer.class); + } + @Test public void testImport() throws Exception - { - + { new FacesRequest() { @Override protected void invokeApplication() throws Exception { - assert getValue("#{importTest.otherValue}").equals("foobar2"); + assert getValue("#{importTest.otherValue}").equals("foobar2"); } }.run(); } - - + + @Name("importTest") @Import("importTest.ns2") public static class Importer { @@ -42,5 +54,4 @@ return "foobar2"; } } - } Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/ImportTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,14 +1,27 @@ package org.jboss.seam.test.integration; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * @author Pete Muir * */ -public class JavaBeanEqualsTest extends SeamTest +(a)RunWith(Arquillian.class) +public class JavaBeanEqualsTest extends JUnitSeamTest { + @Deployment(name="JavaBeanEqualsTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(BeanA.class); + } @Test // Test for JBSEAM-1257 Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -11,25 +11,31 @@ import javax.jms.TopicPublisher; import javax.jms.TopicSession; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; +(a)RunWith(Arquillian.class) +// @Ignore public class MessagingTest - extends SeamTest + extends JUnitSeamTest { - @Test - public void delayForStartup() - throws InterruptedException + @Deployment(name="MessagingTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() { - // need to delay a bit to make sure the messaging system is running - // really only needed when running this test in isolation - Thread.sleep(5000); + return Deployments.defaultSeamDeployment(); } - - @Test(dependsOnMethods={"delayForStartup"}) + + @Test public void publishToTopic() throws Exception { @@ -52,7 +58,7 @@ assert messageText.getValue().equals("message for topic"); } - @Test(dependsOnMethods={"delayForStartup"}) + @Test public void sendToQueue() throws Exception { @@ -106,7 +112,7 @@ @MessageDriven(activationConfig={ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"), - @ActivationConfigProperty(propertyName="destination", propertyValue="topic/testTopic") + @ActivationConfigProperty(propertyName="destination", propertyValue="topic/test") }) @Name("testTopicListener") static public class TestTopicListener @@ -127,7 +133,7 @@ @MessageDriven(activationConfig={ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), - @ActivationConfigProperty(propertyName="destination", propertyValue="queue/testQueue") + @ActivationConfigProperty(propertyName="destination", propertyValue="queue/test") }) @Name("testQueueListener") static public class TestQueueListener Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/MessagingTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,13 +1,26 @@ package org.jboss.seam.test.integration; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.init.NamespacePackageResolver; -import org.jboss.seam.mock.SeamTest; -import org.testng.Assert; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.runner.RunWith; +import org.junit.Assert; +import org.junit.Test; +(a)RunWith(Arquillian.class) public class NamespaceResolverTest - extends SeamTest + extends JUnitSeamTest { + @Deployment(name="NamespaceResolverTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment(); + } + NamespacePackageResolver resolver = new NamespacePackageResolver(); @Test @@ -42,10 +55,10 @@ } private void test(String namespace, String packageName) { - Assert.assertEquals(resolver.resolve(namespace), packageName); + Assert.assertEquals(packageName, resolver.resolve(namespace)); } private void testFail(String namespace) { - Assert.assertNull(resolver.resolve(namespace), namespace); + Assert.assertNull(namespace, resolver.resolve(namespace)); } } Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,25 +1,21 @@ package org.jboss.seam.test.integration; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.core.Init; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; public class NamespaceTest - extends SeamTest + extends JUnitSeamTest { - @Override - protected void startJbossEmbeddedIfNecessary() - throws org.jboss.deployers.spi.DeploymentException, - java.io.IOException - { - // don't deploy - } - - @Test public void nameSpaceComponent() throws Exception @@ -89,10 +85,9 @@ } }.run(); } - - + @Name("namespaceTest.fooFactory") - static public class FooFactory { + public static class FooFactory { public class Foo {} @Factory("namespaceTest.ns1.factory") @@ -108,7 +103,4 @@ public void someMethod() { } } - - - } Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageContextTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageContextTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageContextTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,16 +1,28 @@ package org.jboss.seam.test.integration; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * * @author Pete Muir * */ -public class PageContextTest extends SeamTest +(a)RunWith(Arquillian.class) +public class PageContextTest extends JUnitSeamTest { + @Deployment(name="PageContextTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment(); + } @Test public void pageContextTest() throws Exception { Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageContextTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageParamTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageParamTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageParamTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -4,15 +4,28 @@ import javax.faces.application.FacesMessage; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * @author Pete Muir * @author Dan Allen */ -public class PageParamTest extends SeamTest +(a)RunWith(Arquillian.class) +public class PageParamTest extends JUnitSeamTest { + @Deployment(name="PageParamTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(Person.class); + } @Test public void testPageParameter() throws Exception Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/PageParamTest.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/People.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Person.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Person.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Person.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,7 +1,7 @@ package org.jboss.seam.test.integration; import java.io.Serializable; -import org.hibernate.validator.Length; +import javax.validation.constraints.Size; import org.jboss.seam.annotations.Name; @@ -19,7 +19,7 @@ private String name; - @Length(min = 3, max = 10) + @Size(min = 3, max = 10) public String getName() { return name; Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Person.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Thing.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/UnversionedThing.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,15 +1,31 @@ package org.jboss.seam.test.integration.bpm; -import org.jboss.seam.mock.SeamTest; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.seam.test.integration.Deployments; +import org.jboss.shrinkwrap.api.Archive; import org.jbpm.jpdl.el.ELException; -import org.testng.annotations.Test; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runner.RunWith; /** * @author Pete Muir * */ -public class SeamExpressionEvaluatorTest extends SeamTest +@Ignore +(a)RunWith(Arquillian.class) +public class SeamExpressionEvaluatorTest extends JUnitSeamTest { + @Deployment(name="SeamExpressionEvaluatorTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.jbpmSeamDeployment() + .addClasses(SeamExpressionEvaluatorTestController.class); + } // Test for JBSEAM-1937 @Test Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -18,17 +18,32 @@ import javax.faces.model.DataModel; import javax.faces.model.ListDataModel; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.faces.DataModels; import org.jboss.seam.jsf.ArrayDataModel; import org.jboss.seam.jsf.MapDataModel; import org.jboss.seam.jsf.SetDataModel; -import org.jboss.seam.mock.SeamTest; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.seam.test.integration.Deployments; import org.jboss.seam.test.integration.Foo; +import org.jboss.seam.test.integration.People; import org.jboss.seam.test.integration.Person; -import org.testng.annotations.Test; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; -public class DataModelTest extends SeamTest +(a)RunWith(Arquillian.class) +public class DataModelTest extends JUnitSeamTest { + @Deployment(name="DataModelTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment() + .addClasses(Foo.class, Person.class, People.class); + } @Test public void testDataModels() throws Exception Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -8,15 +8,29 @@ import javax.faces.component.UIOutput; import javax.faces.event.ValueChangeEvent; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.LocaleConfig; import org.jboss.seam.international.LocaleSelector; import org.jboss.seam.Seam; import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.seam.test.integration.Deployments; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; -public class LocaleTest extends SeamTest +(a)RunWith(Arquillian.class) +public class LocaleTest extends JUnitSeamTest { + @Deployment(name="LocaleTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment(); + } + @Test public void localeTest() throws Exception { Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -5,18 +5,31 @@ import javax.faces.component.UIOutput; import javax.faces.event.ValueChangeEvent; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.international.TimeZoneSelector; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.seam.test.integration.Deployments; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * * @author Pete Muir * */ -public class TimeZoneTest extends SeamTest +(a)RunWith(Arquillian.class) +public class TimeZoneTest extends JUnitSeamTest { - + @Deployment(name="TimeZoneTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment(); + } + @Test public void timeZoneTest() throws Exception { Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -9,17 +9,31 @@ import javax.el.PropertyNotFoundException; import javax.el.PropertyNotWritableException; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.seam.test.integration.Deployments; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.runner.RunWith; +import org.junit.Test; + /** * Test for adding EL resolvers to Seam MockFacesContext * * @author Pete Muir * */ -public class SeamMockELResolverTest extends SeamTest +(a)RunWith(Arquillian.class) +public class SeamMockELResolverTest extends JUnitSeamTest { + @Deployment(name="SecurityTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment(); + } private static final String property = "customELResolverTest"; Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,15 +1,18 @@ package org.jboss.seam.test.integration.mock; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.seam.test.integration.Action; +import org.jboss.seam.test.integration.Deployments; +import org.jboss.seam.test.integration.Person; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.runner.RunWith; +import org.junit.Test; -public class SeamTestTest extends SeamTest +public class SeamTestTest extends JUnitSeamTest { - - @Override - protected void startJbossEmbeddedIfNecessary() - throws org.jboss.deployers.spi.DeploymentException ,java.io.IOException {} - private static final String PETER_NAME = "Pete Muir"; private static final String PETER_USERNAME = "pmuir"; Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -8,24 +8,38 @@ import javax.security.auth.login.LoginException; import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.Component; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.contexts.Lifecycle; -import org.jboss.seam.mock.AbstractSeamTest; +import org.jboss.seam.mock.JUnitSeamTest; import org.jboss.seam.mock.MockLoginModule; import org.jboss.seam.security.AuthorizationException; import org.jboss.seam.security.Identity; import org.jboss.seam.security.NotLoggedInException; +import org.jboss.seam.test.integration.Deployments; import org.jboss.seam.web.Session; -import org.testng.annotations.Test; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Seam Security Unit Tests * * @author Shane Bryzak */ -public class SecurityTest extends AbstractSeamTest -{ +(a)RunWith(Arquillian.class) +public class SecurityTest extends JUnitSeamTest +{ + @Deployment(name="SecurityTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + return Deployments.defaultSeamDeployment(); + } + private Configuration createMockJAASConfiguration() { return new Configuration() Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java ___________________________________________________________________ Deleted: svn:executable - * Deleted: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/ejb-jar.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/ejb-jar.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/ejb-jar.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" - version="3.0"> - - <interceptors> - <interceptor> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor> - </interceptors> - - <assembly-descriptor> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor-binding> - </assembly-descriptor> - -</ejb-jar> \ No newline at end of file Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/persistence.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/persistence.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -7,10 +7,11 @@ <persistence-unit name="integration"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/integrationDatasource</jta-data-source> + <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source> <properties> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.cache.use_query_cache" value="true"/> + <property name="hibernate.cache.use_query_cache" value="false"/> + <property name="hibernate.cache.use_second_level_cache" value="false"/> <property name="hibernate.show_sql" value="true"/> <property name="jboss.entity.manager.factory.jndi.name" value="java:/integrationEntityManagerFactory"/> </properties> Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/META-INF/persistence.xml ___________________________________________________________________ Deleted: svn:executable - * Copied: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml (from rev 14390, branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components-jbpm.xml) =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml (rev 0) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components-jbpm.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:bpm="http://jboss.com/products/seam/bpm" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:i18n="http://jboss.com/products/seam/international" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:web="http://jboss.com/products/seam/web" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:jms="http://jboss.com/products/seam/jms" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation= + "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd + http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.3.xsd + http://jboss.com/products/seam/international http://jboss.com/products/seam/international-2.3.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.3.xsd + http://jboss.com/products/seam/jms http://jboss.com/products/seam/jms-2.3.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd"> + + <core:init debug="false" jndi-pattern="@jndiPattern@" /> + + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" + conversation-id-parameter="cid"/> + + <i18n:locale-config default-locale="fr_CA" supported-locales="fr_CA fr_FR en"/> + + <persistence:managed-persistence-context name="entityManager" + auto-create="true" + persistence-unit-jndi-name="java:/integrationEntityManagerFactory" /> + + + <bpm:jbpm> + <bpm:process-definitions> + <value>testProcess1.jpdl.xml</value> + <value>testProcess2.jpdl.xml</value> + <value>testProcess3.jpdl.xml</value> + <value>testProcess4.jpdl.xml</value> + </bpm:process-definitions> + </bpm:jbpm> + + + <jms:topic-connection topic-connection-factory-jndi-name="/ConnectionFactory" /> + <jms:queue-connection queue-connection-factory-jndi-name="/ConnectionFactory" /> + + <jms:managed-topic-publisher name="testPublisher" + auto-create="true" + topic-jndi-name="/topic/testTopic" /> + + <jms:managed-queue-sender name="testSender" + auto-create="true" + queue-jndi-name="/queue/testQueue" /> + + +</components> Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -20,7 +20,7 @@ http://jboss.com/products/seam/jms http://jboss.com/products/seam/jms-2.3.xsd http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd"> - <core:init debug="false" jndi-pattern="@jndiPattern@" /> + <core:init debug="false" jndi-pattern="java:app/test/#{ejbName}" /> <core:manager concurrent-request-timeout="500" conversation-timeout="120000" @@ -32,25 +32,16 @@ auto-create="true" persistence-unit-jndi-name="java:/integrationEntityManagerFactory" /> - <bpm:jbpm> - <bpm:process-definitions> - <value>testProcess1.jpdl.xml</value> - <value>testProcess2.jpdl.xml</value> - <value>testProcess3.jpdl.xml</value> - <value>testProcess4.jpdl.xml</value> - </bpm:process-definitions> - </bpm:jbpm> + <jms:topic-connection topic-connection-factory-jndi-name="java:/ConnectionFactory" /> + <jms:queue-connection queue-connection-factory-jndi-name="java:/ConnectionFactory" /> - <jms:topic-connection topic-connection-factory-jndi-name="/ConnectionFactory" /> - <jms:queue-connection queue-connection-factory-jndi-name="/ConnectionFactory" /> - <jms:managed-topic-publisher name="testPublisher" auto-create="true" - topic-jndi-name="/topic/testTopic" /> - + topic-jndi-name="topic/test" /> + <jms:managed-queue-sender name="testSender" auto-create="true" - queue-jndi-name="/queue/testQueue" /> + queue-jndi-name="queue/test" /> </components> Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/components.xml ___________________________________________________________________ Deleted: svn:executable - * Copied: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/ejb-jar.xml (from rev 14390, branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml) =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/ejb-jar.xml (rev 0) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/ejb-jar.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" + version="3.0"> + + <interceptors> + <interceptor> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor> + </interceptors> + + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> + +</ejb-jar> \ No newline at end of file Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/pages.xml ___________________________________________________________________ Deleted: svn:executable - * Copied: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml (from rev 14390, branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/web.xml) =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="3.0" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + +</web-app> Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/components.properties ___________________________________________________________________ Deleted: svn:executable - * Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/hibernate.cfg.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/hibernate.cfg.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -8,11 +8,15 @@ <session-factory> <property name="show_sql">false</property> - <property name="connection.datasource">java:/integrationDatasource</property> + <property name="connection.datasource">java:jboss/datasources/ExampleDS</property> <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> <property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="hbm2ddl.auto">create-drop</property> + + <property name="hibernate.cache.use_query_cache">false</property> + <property name="hibernate.cache.use_second_level_cache">false</property> +   @@ -48,6 +52,8 @@    + + <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" />  <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/hibernate.cfg.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/jboss-seam-integration-tests-ds.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/jbpm.cfg.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/messages_en.properties ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/seam.properties ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/test-destinations-service.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess1.jpdl.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess2.jpdl.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess3.jpdl.xml ___________________________________________________________________ Deleted: svn:executable - * Property changes on: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/testProcess4.jpdl.xml ___________________________________________________________________ Deleted: svn:executable - * Copied: branches/community/Seam_2_3/seam-integration-tests/src/test/resources-jbossas-7/arquillian.xml (from rev 14390, branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml) =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/src/test/resources-jbossas-7/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources-jbossas-7/arquillian.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + <property name="serverConfig">standalone-full.xml</property> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/seam-integration-tests/testng.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/testng.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests/testng.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,85 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="Seam Integration Testsuite" verbose="2" parallel="false"> - <test name="Seam Integration Tests Contexts and Components"> - <classes> - <class name="org.jboss.seam.test.integration.PageContextTest" /> - <class name="org.jboss.seam.test.integration.ConversationTest" /> - <class name="org.jboss.seam.test.integration.ImportTest" /> - <class name="org.jboss.seam.test.integration.NamespaceTest" /> - <class name="org.jboss.seam.test.integration.JavaBeanEqualsTest" /> - <class name="org.jboss.seam.test.integration.NamespaceResolverTest" /> - <class name="org.jboss.seam.test.integration.ConcurrentFactoryTest" /> - </classes> - </test> - <test name="Seam Integration Tests Persistence"> - <classes> - <class name="org.jboss.seam.test.integration.EntityTest" /> - <class name="org.jboss.seam.test.integration.EntityPassivationTest" /> - </classes> - </test> - - <test name="Seam Integration Tests Events"> - <classes> - <class name="org.jboss.seam.test.integration.EventTest" /> - </classes> - </test> - - <test name="Seam Integration Tests EL"> - <classes> - <class name="org.jboss.seam.test.integration.ELTest" /> - </classes> - </test> - - <test name="Seam Integration Tests Framework"> - <classes> - <class name="org.jboss.seam.test.integration.IdentifierTest" /> - </classes> - </test> - - <test name="Seam Integration Tests i8ln"> - <classes> - <class name="org.jboss.seam.test.integration.i8ln.TimeZoneTest" /> - <class name="org.jboss.seam.test.integration.i8ln.LocaleTest" /> - </classes> - </test> - - <test name="Seam Integration Tests BPM"> - <classes> - <class name="org.jboss.seam.test.integration.BusinessProcessTest" /> - <class name="org.jboss.seam.test.integration.bpm.SeamExpressionEvaluatorTest" /> - </classes> - </test> - - <test name="Seam Integration Tests JMS"> - <classes> - <class name="org.jboss.seam.test.integration.MessagingTest" /> - </classes> - </test> - - <test name="Seam Integration Tests Mocks"> - <classes> - <class name="org.jboss.seam.test.integration.mock.SeamMockELResolverTest" /> - <class name="org.jboss.seam.test.integration.mock.SeamTestTest" /> - </classes> - </test> - - <test name="Seam Integration Tests Pages dot xml"> - <classes> - <class name="org.jboss.seam.test.integration.PageParamTest" /> - </classes> - </test> - - <test name="Seam Integration Tests DataBinding"> - <classes> - <class name="org.jboss.seam.test.integration.databinding.DataModelTest" /> - </classes> - </test> - - <test name="Seam Integration Tests Security"> - <classes> - <class name="org.jboss.seam.test.integration.security.SecurityTest" /> - </classes> - </test> - -</suite> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/pom.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/pom.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,343 +0,0 @@ -<?xml version="1.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> - <parent> - <artifactId>jboss-seam-parent</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> - <relativePath>../jboss-seam-parent/pom.xml</relativePath> - </parent> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-integration-tests-ee6</artifactId> - <name>Seam Integration Tests</name> - - <properties> - </properties> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>true</skip> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>${project.build.directory}/bootstrap</directory> - </fileset> - <fileset> - <directory>${basedir}/src/test/META-INF</directory> - </fileset> - </filesets> - </configuration> - </plugin> - </plugins> - - - </build> - - <dependencies> - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-jpdl</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-servlet</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-api-maven</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.shrinkwrap.resolver</groupId> - <artifactId>shrinkwrap-resolver-impl-maven</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <type>pom</type> - <scope>provided</scope> - </dependency> - - </dependencies> - - <profiles> - <profile> - <id>code-coverage</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <executions> - <execution> - <id>default-test</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.sonatype.maven.plugin</groupId> - <artifactId>emma4it-maven-plugin</artifactId> - <executions> - <execution> - <id>merge</id> - <phase>post-integration-test</phase> - <goals> - <goal>merge</goal> - </goals> - <configuration> - <searchPath>${basedir}/../</searchPath> - </configuration> - </execution> - <execution> - <id>report</id> - <phase>verify</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <sourceSets> - <sourceSet> - <directory>${basedir}/../jboss-seam-jsf2/src/main/java</directory> - <directory>${basedir}/../jboss-seam-debug/src/main/java</directory> - <directory>${basedir}/../jboss-seam-excel/src/main/java</directory> - <directory>${basedir}/../jboss-seam-flex/src/main/java</directory> - <directory>${basedir}/../jboss-seam-gen/src/main/java</directory> - <directory>${basedir}/../jboss-seam-ioc/src/main/java</directory> - <directory>${basedir}/../jboss-seam-jul/src/main/java</directory> - <directory>${basedir}/../jboss-seam-mail/src/main/java</directory> - <directory>${basedir}/../jboss-seam-pdf/src/main/java</directory> - <directory>${basedir}/../jboss-seam-remoting/src/main/java</directory> - <directory>${basedir}/../jboss-seam-resteasy/src/main/java</directory> - <directory>${basedir}/../jboss-seam-rss/src/main/java</directory> - <directory>${basedir}/../jboss-seam-ui/src/main/java</directory> - <directory>${basedir}/../jboss-seam-wicket/src/main/java</directory> - </sourceSet> - </sourceSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jsf2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jsf2</artifactId> - <version>${project.version}</version> - - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - </build> - </profile> - - <profile> - <id>integration-test</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>arquillian</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - <skipTests>false</skipTests> - </configuration> - - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - <skip>false</skip> - <systemProperties> -  - <version.jbossas7>${version.jbossas7}</version.jbossas7> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>arq-jbossas-7-managed</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>arquillian</name> - <value>jbossas-managed-7</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-arquillian-container-managed</artifactId> - </dependency> - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - <testResource> - <directory>src/test/resources-jbossas-7</directory> - </testResource> - </testResources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-as7</id> - <phase>process-test-classes</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-dist</artifactId> - <version>${version.jbossas7}</version> - <type>zip</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>arq-jbossas-7-remote</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-remote-7</value> - </property> - </activation> - - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-arquillian-container-remote</artifactId> - </dependency> - </dependencies> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - <testResource> - <directory>src/test/resources-jbossas-7</directory> - </testResource> - </testResources> - </build> - </profile> - </profiles> -</project> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/readme.txt =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/readme.txt 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/readme.txt 2012-03-14 17:39:25 UTC (rev 14391) @@ -1 +0,0 @@ -Core integration tests for Seam (those not associated with a particular example) \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Action.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Action.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Action.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,11 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.seam.annotations.Name; - -@Name("action") -public class Action { - - public String go() { - return "success"; - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanA.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanA.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanA.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,38 +0,0 @@ -package org.jboss.seam.test.integration; - -import java.io.Serializable; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.Events; - -@Name("beanA") -(a)Scope(ScopeType.CONVERSATION) -@AutoCreate -public class BeanA implements Serializable { - - private String myValue; - - public String getMyValue() { - return myValue; - } - - public void setMyValue(String myValue) { - this.myValue = myValue; - } - - @Create - public void create() { - myValue = "Foo"; - } - - @Observer(value = "BeanA.refreshMyValue") - public void refreshMyValue() { - myValue = "Bar"; - Events.instance().raiseEvent("BeanA.valueModified"); - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanB.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanB.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BeanB.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,33 +0,0 @@ -package org.jboss.seam.test.integration; - -import java.io.Serializable; - -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; - -@Name("beanB") -(a)Scope(ScopeType.PAGE) -@AutoCreate -public class BeanB implements Serializable { - - private String myValue; - - public String getMyValue() { - return myValue; - } - - public void setMyValue(String myValue) { - this.myValue = myValue; - } - - @Observer(value = "BeanA.valueModified") - public void takeValueFromBeanA() { - BeanA beanA = (BeanA) Component.getInstance("beanA"); - myValue = beanA.getMyValue(); - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/BusinessProcessTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,73 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.bpm.CreateProcess; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; - -@Ignore -(a)RunWith(Arquillian.class) -public class BusinessProcessTest - extends JUnitSeamTest -{ - @Deployment(name="BusinessProcessTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.jbpmSeamDeployment().addClasses(ProcessComponent.class); - } - - @Test - public void noProcessDefinition() - throws Exception - { - new FacesRequest() { - @Override - protected void invokeApplication() throws Exception { - try { - invokeAction("#{bpmTest.startInvalid}"); - assert false; - } catch (Exception e) { - // expected - } - } - - }.run(); - } - - @Test - public void noVariableStart() - throws Exception - { - new FacesRequest() { - @Override - protected void invokeApplication() throws Exception { - try { - invokeAction("#{bpmTest.startOne}"); - } catch (Exception e) { - e.printStackTrace(); - assert false; - } - } - - }.run(); - } - - - @Name("bpmTest") - static public class ProcessComponent { - @CreateProcess(definition="NoSuchProcess") - public void startInvalid() { - } - - @CreateProcess(definition="TestProcess1") - public void startOne() { - } - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConcurrentFactoryTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,76 +0,0 @@ -package org.jboss.seam.test.integration; - -import static org.jboss.seam.ScopeType.APPLICATION; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.mock.JUnitSeamTest; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.After; -import org.junit.runner.RunWith; - -public class ConcurrentFactoryTest - extends JUnitSeamTest -{ - - // TODO: Implement a different way to run concurrent test for junit - // @Test(threadPoolSize = 2, invocationCount = 2) - @Test - @Ignore - public void concurrentFactoryCall() - throws Exception - { - new ComponentTest() { - @Override - protected void testComponents() throws Exception { - assert "slowly created String".equals(getValue("#{concurrentFactoryTest.component.injectedString}")); - } - }.run(); - } - - @After - @Override - public void end() - { - if (session != null) { - // Because we run in threads. Only the first thread that finishes ends the session. - ServletLifecycle.endSession(session); - } - session = null; - } - - @Name("concurrentFactoryTest.component") - static public class Component { - @In(value = "concurrentFactoryTest.slowlyCreatedString") String injectedString; - - public String getInjectedString() { - return injectedString; - } - } - - @Name("concurrentFactoryTest.SlowFactory") - static public class SlowFactory { - @Factory(value = "concurrentFactoryTest.slowlyCreatedString", scope = APPLICATION, autoCreate = true) - public String slowlyCreateString() { - try - { - Thread.sleep(1000); - return "slowly created String"; - } - catch (InterruptedException e) - { - e.printStackTrace(); - return null; - } - } - } - - - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConversationTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConversationTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ConversationTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,460 +0,0 @@ -package org.jboss.seam.test.integration; - -import java.util.ArrayList; -import java.util.List; - -import javax.faces.model.SelectItem; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.core.ConversationEntries; -import org.jboss.seam.core.ConversationEntry; -import org.jboss.seam.core.Manager; -import org.jboss.seam.faces.Switcher; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - -(a)RunWith(Arquillian.class) -public class ConversationTest - extends JUnitSeamTest -{ - @Deployment(name="ConversationTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - @Test - public void conversationStack() - throws Exception - { - // no conversation, no stack - new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 0; - } - }.run(); - - // no conversation, no stack - new FacesRequest("/pageWithoutDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 0; - } - }.run(); - - // new conversation, stack = 1 - String rootId = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 1; - } - }.run(); - - // nested conversation, stack =2 - String nested1 = new FacesRequest("/pageWithDescription.xhtml", rootId) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginNestedConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 2; - } - - }.run(); - - // nested conversation without description, not added to stack - String nested2 = new FacesRequest("/pageWithoutDescription.xhtml", nested1) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginNestedConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 2; - } - }.run(); - - // access a page, now it's on the stack - new FacesRequest("/pageWithDescription.xhtml", nested2) { - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 3; - } - }.run(); - - // end conversation, stack goes down - new FacesRequest("/pageWithDescription.xhtml", nested2) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(false); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 2; - } - }.run(); - - // end another one, size is 1 - new FacesRequest("/pageWithDescription.xhtml", nested1) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(false); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationStack}"); - assert entries.size() == 1; - } - }.run(); - } - - @Test - public void conversationList() - throws Exception - { - new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 0; - } - }.run(); - - new FacesRequest("/pageWithoutDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 0; - } - }.run(); - - String conv1 = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 1; - } - }.run(); - - String conv2 = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 2; - } - }.run(); - - String conv3 = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 3; - } - }.run(); - - - new FacesRequest("/pageWithDescription", conv2) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(true); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 2; - } - }.run(); - - new FacesRequest("/pageWithDescription", conv1) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(true); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 1; - } - }.run(); - - - new FacesRequest("/pageWithDescription", conv3) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(true); - } - - @Override - protected void renderResponse() throws Exception { - List<ConversationEntry> entries = (List<ConversationEntry>) getValue("#{conversationList}"); - assert entries.size() == 0; - } - }.run(); - } - - - @Test - public void switcher() - throws Exception - { - new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void renderResponse() throws Exception { - Switcher switcher = (Switcher) getValue("#{switcher}"); - assert switcher.getSelectItems().size() == 0; - assert switcher.getConversationIdOrOutcome() == null; - } - }.run(); - - - final String conv1 = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - Switcher switcher = (Switcher) getValue("#{switcher}"); - assert switcher.getSelectItems().size() == 1; - } - }.run(); - - final String conv2 = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - Switcher switcher = (Switcher) getValue("#{switcher}"); - assert switcher.getSelectItems().size() == 2; - } - }.run(); - - final String conv3 = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception { - Switcher switcher = (Switcher) getValue("#{switcher}"); - assert switcher.getSelectItems().size() == 3; - } - }.run(); - - new FacesRequest() { - @Override - protected void renderResponse() throws Exception { - Switcher switcher = (Switcher) getValue("#{switcher}"); - assert switcher.getSelectItems().size() == 3; - - List<SelectItem> items = switcher.getSelectItems(); - List<String> values = new ArrayList<String>(); - for (SelectItem item: items) { - assert item.getLabel().equals("page description"); - values.add((String) item.getValue()); - } - - assert values.contains(conv1); - assert values.contains(conv2); - assert values.contains(conv3); - } - }.run(); - - new FacesRequest("/pageWithDescription.xhtml", conv1) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(true); - } - }.run(); - - new FacesRequest("/pageWithDescription.xhtml", conv2) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(true); - } - - @Override - protected void renderResponse() throws Exception { - Switcher switcher = (Switcher) getValue("#{switcher}"); - assert switcher.getSelectItems().size() == 1; - assert switcher.getSelectItems().get(0).getLabel().equals("page description"); - assert switcher.getSelectItems().get(0).getValue().equals(conv3); - } - }.run(); - - new FacesRequest("/pageWithAnotherDescription.xhtml", conv3) { - @Override - protected void renderResponse() throws Exception { - Switcher switcher = (Switcher) getValue("#{switcher}"); - assert switcher.getSelectItems().size() == 1; - - assert switcher.getSelectItems().get(0).getLabel().equals("another page description"); - assert switcher.getSelectItems().get(0).getValue().equals(conv3); - } - }.run(); - } - - @Test - public void killAllOthers() throws Exception - { - new FacesRequest("/pageWithAnotherDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception - { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception - { - assert ConversationEntries.instance().size() == 1; - } - }.run(); - - new FacesRequest("/pageWithoutDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception - { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception - { - assert ConversationEntries.instance().size() == 2; - } - }.run(); - - new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception - { - Manager.instance().beginConversation(); - Manager.instance().killAllOtherConversations(); - } - - @Override - protected void renderResponse() throws Exception - { - assert ConversationEntries.instance().size() == 1; - } - }.run(); - - } - - @Test - public void nestedKillAllOthers() throws Exception - { - - final String unrelated = new FacesRequest("/pageWithoutDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception - { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception - { - assert ConversationEntries.instance().size() == 1; - } - }.run(); - - String root = new FacesRequest("/pageWithDescription.xhtml") { - @Override - protected void invokeApplication() throws Exception - { - Manager.instance().beginConversation(); - } - - @Override - protected void renderResponse() throws Exception - { - assert ConversationEntries.instance().size() == 2; - } - }.run(); - - // nested conversation - new FacesRequest("/pageWithDescription.xhtml", root) { - @Override - protected void invokeApplication() throws Exception - { - Manager.instance().beginNestedConversation(); - } - - @Override - protected void renderResponse() throws Exception - { - assert ConversationEntries.instance().size() == 3; - - Manager.instance().killAllOtherConversations(); - assert ConversationEntries.instance().size() == 2; - assert ConversationEntries.instance().getConversationIds() - .contains(unrelated) == false; - } - - }.run(); - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Country.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Country.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Country.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,54 +0,0 @@ -package org.jboss.seam.test.integration; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * @author Pete Muir - * - */ -@Entity -public class Country -{ - - @Id @GeneratedValue - private Integer id; - - private String name; - - /** - * @return the id - */ - public Integer getId() - { - return this.id; - } - - /** - * @param id the id to set - */ - public void setId(Integer id) - { - this.id = id; - } - - /** - * @return the name - */ - public String getName() - { - return this.name; - } - - /** - * @param name the name to set - */ - public void setName(String name) - { - this.name = name; - } - - - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/CountryHome.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/CountryHome.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/CountryHome.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,14 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.framework.EntityHome; - -/** - * @author Pete Muir - * - */ -@Name("countryHome") -public class CountryHome extends EntityHome<Country> -{ - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,80 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.seam.test.integration.bpm.SeamExpressionEvaluatorTestController; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -import org.jboss.shrinkwrap.resolver.api.DependencyResolvers; -import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver; - -public class Deployments { - public static WebArchive defaultSeamDeployment() { - return ShrinkWrap.create(WebArchive.class, "test.war") - .addAsWebInfResource(new StringAsset( - "<jboss-deployment-structure>" + - "<deployment>" + - "<dependencies>" + - "<module name=\"org.javassist\"/>" + - "<module name=\"org.dom4j\"/>" + - "</dependencies>" + - "</deployment>" + - "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") - .addAsResource("seam.properties") - .addAsResource("components.properties") - .addAsResource("messages_en.properties") - .addAsResource("META-INF/persistence.xml") - - .addAsResource("hibernate.cfg.xml") - .addAsWebInfResource("WEB-INF/components.xml", "components.xml") - .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") - .addAsWebInfResource("WEB-INF/web.xml", "web.xml") - .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") - - .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) - .configureFrom("pom.xml") - .goOffline() - .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT") - .resolveAsFiles()); - } - - public static WebArchive jbpmSeamDeployment() { - return ShrinkWrap.create(WebArchive.class, "test.war") - .addAsWebInfResource(new StringAsset( - "<jboss-deployment-structure>" + - "<deployment>" + - "<dependencies>" + - "<module name=\"org.javassist\"/>" + - "<module name=\"org.dom4j\"/>" + - "<module name=\"org.apache.commons.collections\"/>" + - "</dependencies>" + - "</deployment>" + - "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") - .addAsResource("seam.properties") - .addAsResource("components.properties") - .addAsResource("messages_en.properties") - .addAsResource("META-INF/persistence.xml") - - .addAsResource("testProcess1.jpdl.xml") - .addAsResource("testProcess2.jpdl.xml") - .addAsResource("testProcess3.jpdl.xml") - .addAsResource("testProcess4.jpdl.xml") - - .addAsResource("jbpm.cfg.xml") - - .addAsResource("hibernate.cfg.xml") - .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml") - .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") - .addAsWebInfResource("WEB-INF/web.xml", "web.xml") - .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml") - - .addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class) - .configureFrom("pom.xml") - .goOffline() - .artifact("org.jboss.seam:jboss-seam-jsf2:2.3.0-SNAPSHOT") - .artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3-seam2") - .exclusion("org.hibernate:hibernate-core") - .resolveAsFiles()); - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ELTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ELTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ELTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,143 +0,0 @@ -package org.jboss.seam.test.integration; - -import javax.el.ELException; -import javax.faces.el.MethodBinding; -import javax.faces.el.ValueBinding; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.jsf.UnifiedELMethodBinding; -import org.jboss.seam.jsf.UnifiedELValueBinding; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - - -/** - * - * @author Pete Muir - * - */ -public class ELTest extends JUnitSeamTest -{ - @Test - public void testUnifiedELMethodBinding() throws Exception - { - new FacesRequest() - { - @SuppressWarnings("deprecation") - @Override - protected void invokeApplication() throws Exception - { - MethodBinding methodBinding = new UnifiedELMethodBinding("#{action.go}", new Class[0]); - - assert "#{action.go}".equals(methodBinding.getExpressionString()); - - assert String.class.equals(methodBinding.getType(getFacesContext())); - - Object result = methodBinding.invoke(getFacesContext(), new Object[0]); - - assert result instanceof String; - assert "success".equals(result); - } - }.run(); - } - - @Test - public void testUnifiedELMethodBindingWithNull() throws Exception - { - new FacesRequest() - { - @SuppressWarnings("deprecation") - @Override - protected void invokeApplication() throws Exception - { - - MethodBinding methodBinding = new UnifiedELMethodBinding("#{action.go}", null); - - assert String.class.equals(methodBinding.getType(getFacesContext())); - - Object result = methodBinding.invoke(getFacesContext(), null); - - assert result instanceof String; - assert "success".equals(result); - } - }.run(); - } - - @Test - public void testEmptyUnifiedELMethodBinding() throws Exception - { - new FacesRequest() - { - @SuppressWarnings("deprecation") - @Override - protected void invokeApplication() throws Exception - { - - MethodBinding methodBinding = new UnifiedELMethodBinding(); - boolean failed = false; - try - { - methodBinding.invoke(getFacesContext(), null); - } - catch (ELException e) { - failed = true; - } - assert failed; - } - }.run(); - } - - @Test - public void testUnifiedELValueBinding() throws Exception - { - new FacesRequest() - { - @SuppressWarnings("deprecation") - @Override - protected void invokeApplication() throws Exception - { - ValueBinding valueBinding = new UnifiedELValueBinding("#{person.name}"); - - assert "#{person.name}".equals(valueBinding.getExpressionString()); - - assert !valueBinding.isReadOnly(getFacesContext()); - - assert String.class.equals(valueBinding.getType(getFacesContext())); - - valueBinding.setValue(getFacesContext(), "Pete"); - - assert "Pete".equals(valueBinding.getValue(getFacesContext())); - } - }.run(); - } - - @Test - public void testEmptyUnifiedELValueBinding() throws Exception - { - new FacesRequest() - { - @SuppressWarnings("deprecation") - @Override - protected void invokeApplication() throws Exception - { - - ValueBinding valueBinding = new UnifiedELValueBinding(); - boolean failed = false; - try - { - valueBinding.setValue(getFacesContext(), "Pete"); - valueBinding.getValue(getFacesContext()); - } - catch (ELException e) { - failed = true; - } - assert failed; - } - }.run(); - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityPassivationTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,265 +0,0 @@ -package org.jboss.seam.test.integration; - -import java.io.Serializable; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.EntityManager; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.persistence.ManagedEntityInterceptor; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Verifies the work of the ManagedEntityInterceptor. Specifically that - * collections containing entity instances are properly put into the session and - * pulled back into the conversation-scoped component between requests (during a - * potential period of passivation of the SFSB). The test also verifies that - * when a component in a nested conversation calls a component in a parent - * conversation, that the passivated state is kept with the parent conversation. - * - * @author Norman Richards - * @author Dan Allen - */ -(a)RunWith(Arquillian.class) -public class EntityPassivationTest extends JUnitSeamTest -{ - @Deployment(name="EntityPassivationTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(SomeComponent.class, NestedComponent.class, UnversionedThing.class); - } - - @Test - public void testEntityList() throws Exception - { - String pid = new FacesRequest("/test.xhtml") - { - @Override - protected void invokeApplication() throws Exception - { - // MEI is not installed by default, so we need to enable it - Component.forName("entitytest.someComponent").addInterceptor(new ManagedEntityInterceptor()); - Component.forName("entitytest.nestedComponent").addInterceptor(new ManagedEntityInterceptor()); - - Conversation.instance().begin(true, false); - - invokeAction("#{entitytest.someComponent.createSomeThings}"); - invokeAction("#{entitytest.someComponent.loadThings}"); - } - - @Override - protected void renderResponse() throws Exception - { - Object thing = getValue("#{entitytest.someComponent.thing}"); - assert thing != null; - - List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); - assert thingList != null && !thingList.isEmpty(); - assert thingList.get(0) != null; - - Set thingSet = (Set) getValue("#{entitytest.someComponent.thingsAsSet}"); - assert thingSet != null && thingSet.size() > 0; - assert thingSet.iterator().next() != null; - - Map thingMap = (Map) getValue("#{entitytest.someComponent.thingsAsMap}"); - assert thingMap != null && thingMap.size() > 0; - } - }.run(); - - new FacesRequest("/test.xhtml", pid) - { - // the entities should be passivated - }.run(); - - new FacesRequest("/test.xhtml", pid) - { - // passivated a second time - }.run(); - - new FacesRequest("/test.xhtml", pid) - { - @Override - protected void renderResponse() throws Exception - { - Object thing = getValue("#{entitytest.someComponent.thing}"); - assert thing != null; - - List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); - assert thingList != null && !thingList.isEmpty(); - assert thingList.get(0) != null; - - Set thingSet = (Set) getValue("#{entitytest.someComponent.thingsAsSet}"); - assert thingSet != null && thingSet.size() > 0; - assert thingSet.iterator().next() != null; - - Map thingMap = (Map) getValue("#{entitytest.someComponent.thingsAsMap}"); - assert thingMap != null && thingMap.size() > 0; - } - - }.run(); - - // Start a nested conversation to verify that calls to a component in a parent conversation - // will passivate that component's state in the parent conversation context and not in - // the nested conversation. Thus, when the parent conversation is restored, its state - // will be properly restored. - String nid = new FacesRequest("/test.xhtml", pid) - { - @Override - protected void invokeApplication() throws Exception - { - invokeMethod("#{entitytest.nestedComponent.nest}"); - } - - @Override - protected void renderResponse() throws Exception - { - assert Conversation.instance().isNested(); - } - - }.run(); - - new FacesRequest("/test.xhtml", nid) - { - @Override - protected void invokeApplication() throws Exception - { - // invoke component in parent conversation from nested conversation - invokeMethod("#{entitytest.someComponent.removeFirstThingFromList}"); - } - - @Override - protected void renderResponse() throws Exception - { - // the nested conversation should not hold the serialized property of the component in the parent conversation - assert !Arrays.asList(Contexts.getConversationContext().getNames()).contains("entitytest.someComponent.thingList"); - List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); - assert thingList.size() == 1; - } - }.run(); - - new FacesRequest("/test.xhtml", nid) - { - @Override - protected void invokeApplication() throws Exception - { - invokeMethod("#{entitytest.nestedComponent.end}"); - } - }.run(); - - new FacesRequest("/test.xhtml", pid) - { - @Override - protected void renderResponse() throws Exception - { - // The state of the component in the parent conversation should be preserved. - List thingList = (List) getValue("#{entitytest.someComponent.thingsAsList}"); - assert thingList.size() == 1; - } - }.run(); - } - - @Name("entitytest.someComponent") - @Scope(ScopeType.CONVERSATION) - @AutoCreate - public static class SomeComponent implements Serializable - { - @In - EntityManager entityManager; - - Set<UnversionedThing> thingSet; - List<UnversionedThing> thingList; - Map<Long, UnversionedThing> thingMap; - UnversionedThing thing; - - public void loadThings() - { - thingList = entityManager.createQuery("select t from UnversionedThing t").getResultList(); - thingSet = new HashSet<UnversionedThing>(thingList); - - thingMap = new HashMap<Long, UnversionedThing>(); - for (UnversionedThing thing : thingList) - { - thingMap.put(thing.getId(), thing); - } - - thing = thingList.get(0); - } - - public List<UnversionedThing> getThingsAsList() - { - return thingList; - } - - public Set<UnversionedThing> getThingsAsSet() - { - return thingSet; - } - - public Map<Long, UnversionedThing> getThingsAsMap() - { - return thingMap; - } - - public UnversionedThing getThing() - { - return thing; - } - - public void removeFirstThingFromList() - { - loadThings(); - thingList.remove(0); - } - - public void createSomeThings() - { - UnversionedThing thing1 = new UnversionedThing(); - thing1.setName("thing one"); - entityManager.persist(thing1); - - UnversionedThing thing2 = new UnversionedThing(); - thing2.setName("thing two"); - entityManager.persist(thing2); - } - } - - @Name("entitytest.nestedComponent") - @Scope(ScopeType.CONVERSATION) - @AutoCreate - public static class NestedComponent implements Serializable - { - @In - EntityManager entityManager; - - @Begin(nested = true) - public void nest() - { - } - - public void end() - { - Conversation.instance().end(); - } - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EntityTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,166 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.mock.JUnitSeamTest; -import java.util.HashMap; -import java.util.Map; - -import javax.persistence.EntityManager; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.Manager; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; - -(a)RunWith(Arquillian.class) -public class EntityTest - extends JUnitSeamTest -{ - @Deployment(name="EntityTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(Thing.class); - } - - @Test - public void entityUpdatedInNestedConversation() throws Exception { - String parentConversation = new FacesRequest("/page.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Thing thing = new Thing(); - thing.setName("thing"); - EntityManager entityManager = (EntityManager) getValue("#{entityManager}"); - entityManager.persist(thing); - Contexts.getConversationContext().set("thing", thing); - Manager.instance().beginConversation(); - } - }.run(); - - - new FacesRequest("/page.xhtml", parentConversation) { - }.run(); - - // nested conversation - String nestedId = new FacesRequest("/page.xhtml", parentConversation) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().beginNestedConversation(); - } - }.run(); - - // update entity in nested conversation - new FacesRequest("/page.xhtml", nestedId) { - @Override - protected void invokeApplication() throws Exception { - Thing thing = (Thing) Contexts.getConversationContext().get("thing"); - thing.setName("foo"); - EntityManager entityManager = (EntityManager) getValue("#{entityManager}"); - entityManager.flush(); - } - }.run(); - - // end nested conversation - assert new FacesRequest("/page.xhtml", nestedId) { - @Override - protected void invokeApplication() throws Exception { - Manager.instance().endConversation(false); - } - }.run().equals(parentConversation); - - - // This tests that the activation in the parent conversation - // doesn't fail - new FacesRequest("/page.xhtml",parentConversation) { - @Override - protected void renderResponse() throws Exception { - Thing thing = (Thing) Contexts.getConversationContext().get("thing"); - assert thing.getName().equals("foo"); - } - }.run(); - } - - @Test - public void testStale() throws Exception { - - final Map<String, Long> holder = new HashMap<String, Long>(); - - final String conversation1 = new FacesRequest("/page.xhtml") { - @Override - protected void invokeApplication() throws Exception { - Thing thing = new Thing(); - thing.setName("thing"); - EntityManager entityManager = (EntityManager) getValue("#{entityManager}"); - entityManager.persist(thing); - holder.put("id", thing.getId()); - Contexts.getConversationContext().set("thing", thing); - Manager.instance().beginConversation(); - } - }.run(); - - new FacesRequest("/page.xhtml", conversation1) { - }.run(); - - // update in second conversation - new FacesRequest("/page.xhtml") { - @Override - @SuppressWarnings("cast") - protected void invokeApplication() throws Exception { - EntityManager entityManager = (EntityManager) getValue("#{entityManager}"); - Thing thing = (Thing) entityManager.find(Thing.class, holder.get("id")); - thing.setName("foo"); - entityManager.flush(); - } - }.run(); - - new FacesRequest("/page.xhtml", conversation1) { - EntityExceptionObserver observer; - - @Override - protected void invokeApplication() throws Exception { - Thing thing = (Thing) Contexts.getConversationContext().get("thing"); - thing.setName("bar"); - - observer = (EntityExceptionObserver) getValue("#{entityExceptionObserver}"); - assert observer != null; - } - - @Override - protected void renderResponse() throws Exception { - Assert.fail("page rendered without redirect, expected StaleStateException!"); - } - - @Override - protected void afterRequest() { - assert observer.getOptimisticLockExceptionSeen(); - } - }.run(); - } - - @Name("entityExceptionObserver") - public static class EntityExceptionObserver { - - private boolean exceptionSeen; - - @Observer(value="org.jboss.seam.exceptionHandled.javax.persistence.OptimisticLockException") - public void handleException(Exception e) { - exceptionSeen=true; - } - - public boolean getOptimisticLockExceptionSeen() { - return exceptionSeen; - } - - @Override - public String toString() { - return "EntityExceptionObserver[" + exceptionSeen + "]"; - } - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EventTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EventTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/EventTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,61 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.Component; -import org.jboss.seam.core.Events; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - - -/** - * - * @author Pete Muir - * - */ -(a)RunWith(Arquillian.class) -public class EventTest extends JUnitSeamTest { - - @Deployment(name="IdentifierTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(BeanA.class, BeanB.class); - } - - @Test - public void testEventChain() throws Exception { - - new FacesRequest("/index.xhtml") { - - @Override - protected void invokeApplication() throws Exception { - BeanA beanA = (BeanA) Component.getInstance("beanA"); - BeanB beanB = (BeanB) Component.getInstance("beanB"); - - assert "Foo".equals(beanA.getMyValue()); - assert beanB.getMyValue() == null; - - Events.instance().raiseEvent("BeanA.refreshMyValue"); - - beanA = (BeanA) Component.getInstance("beanA"); - - assert "Bar".equals(beanA.getMyValue()); - } - - @Override - protected void renderResponse() throws Exception - { - BeanB beanB = (BeanB) Component.getInstance("beanB"); - assert "Bar".equals(beanB.getMyValue()); - } - }.run(); - } - -} - - Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Foo.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Foo.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Foo.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,94 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.test.integration; - -import java.io.Serializable; - -import javax.ejb.Remove; - -import javax.validation.constraints.NotNull; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute </a> - * @version $Revision: 6435 $ - */ -@Name("foo") -(a)Scope(ScopeType.SESSION) -@SuppressWarnings("deprecation") -public class Foo implements Serializable -{ - private static final long serialVersionUID = -5448030633067107049L; - - private String value; - - public String foo() { return "foo"; } - - @Remove - public void destroy() {} - - @NotNull - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } - - public String bar() - { - return "bar"; - } - - @Begin - public String begin() - { - return "begun"; - } - @End - public String end() - { - return "ended"; - } - - @Begin - public String beginNull() - { - return null; - } - @End - public String endNull() - { - return null; - } - - @Begin - public void beginVoid() { } - @End - public void endVoid() { } - - @Begin(ifOutcome="success") - public String beginIf() - { - return "success"; - } - @End(ifOutcome="success") - public String endIf() - { - return "success"; - } - -} - - Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/IdentifierTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,77 +0,0 @@ -package org.jboss.seam.test.integration; - -import javax.persistence.EntityManager; - -import org.hibernate.Session; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.framework.EntityIdentifier; -import org.jboss.seam.framework.HibernateEntityIdentifier; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * @author Pete Muir - * - */ -(a)RunWith(Arquillian.class) -public class IdentifierTest extends JUnitSeamTest -{ - @Deployment(name="IdentifierTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(Country.class, CountryHome.class); - } - - @Test - public void testEntityIdentifier() throws Exception - { - new ComponentTest() - { - - @Override - protected void testComponents() throws Exception - { - setValue("#{countryHome.instance.name}", "foo"); - invokeMethod("#{countryHome.persist}"); - Country country = (Country) getValue("#{countryHome.instance}"); - EntityManager entityManager = (EntityManager) getValue("#{countryHome.entityManager}"); - - EntityIdentifier entityIdentifier = new EntityIdentifier(country, entityManager); - assert "foo".equals(((Country) entityIdentifier.find(entityManager)).getName()); - EntityIdentifier entityIdentifier2 = new EntityIdentifier(country, entityManager); - assert entityIdentifier.equals(entityIdentifier2); - } - - }.run(); - } - - @Test - public void testHibernateEntityIdentifier() throws Exception - { - new ComponentTest() - { - - @Override - protected void testComponents() throws Exception - { - setValue("#{countryHome.instance.name}", "foo"); - invokeMethod("#{countryHome.persist}"); - Country country = (Country) getValue("#{countryHome.instance}"); - Session session = (Session) getValue("#{countryHome.entityManager.delegate}"); - - HibernateEntityIdentifier hibernateEntityIdentifier = new HibernateEntityIdentifier(country, session); - assert "foo".equals(((Country) hibernateEntityIdentifier.find(session)).getName()); - HibernateEntityIdentifier hibernateEntityIdentifier2 = new HibernateEntityIdentifier(country, session); - assert hibernateEntityIdentifier.equals(hibernateEntityIdentifier2); - } - - }.run(); - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ImportTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ImportTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/ImportTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,57 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.Import; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -(a)RunWith(Arquillian.class) -public class ImportTest - extends JUnitSeamTest -{ - @Deployment(name="IdentifierTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(Importer.class); - } - - @Test - public void testImport() - throws Exception - { - new FacesRequest() { - @Override - protected void invokeApplication() - throws Exception - { - assert getValue("#{importTest.otherValue}").equals("foobar2"); - } - }.run(); - } - - - @Name("importTest") - @Import("importTest.ns2") - public static class Importer { - @In - String otherValue; - - public String getOtherValue() { - return otherValue; - } - - @Factory(value="importTest.ns2.otherValue", autoCreate=true) - public String createOtherValue() { - return "foobar2"; - } - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/JavaBeanEqualsTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,43 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * @author Pete Muir - * - */ -(a)RunWith(Arquillian.class) -public class JavaBeanEqualsTest extends JUnitSeamTest -{ - @Deployment(name="JavaBeanEqualsTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(BeanA.class); - } - - @Test - // Test for JBSEAM-1257 - public void testReflexiveEquals() throws Exception - { - new ComponentTest() - { - - @Override - protected void testComponents() throws Exception - { - assert getInstance("beanA").equals(getInstance("beanA")); - assert getValue("#{beanA.component}").equals(getValue("#{beanA.component}")); - } - - }.run(); - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/MessagingTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,170 +0,0 @@ -package org.jboss.seam.test.integration; - -import javax.ejb.ActivationConfigProperty; -import javax.ejb.MessageDriven; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.TextMessage; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; - -(a)RunWith(Arquillian.class) -// @Ignore -public class MessagingTest - extends JUnitSeamTest -{ - @Deployment(name="MessagingTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - @Test - public void publishToTopic() - throws Exception - { - final SimpleReference<String> messageText = new SimpleReference<String>(); - - new FacesRequest() { - @Override - protected void invokeApplication() - throws Exception - { - Contexts.getApplicationContext().set("testMessage", messageText); - invokeAction("#{testTopic.publish}"); - } - }.run(); - - // need to delay a bit to make sure the message is delivered - // might need - Thread.sleep(2000); - - assert messageText.getValue().equals("message for topic"); - } - - @Test - public void sendToQueue() - throws Exception - { - final SimpleReference<String> messageText = new SimpleReference<String>(); - - new FacesRequest() { - @Override - protected void invokeApplication() - throws Exception - { - Contexts.getApplicationContext().set("testMessage", messageText); - invokeAction("#{testQueue.send}"); - } - }.run(); - - // need to delay a bit to make sure the message is delivered - // might need - Thread.sleep(2000); - - assert messageText.getValue().equals("message for queue"); - } - - - @Name("testTopic") - public static class TopicBean { - @In - private TopicPublisher testPublisher; - - @In - private TopicSession topicSession; - - public void publish() - throws JMSException - { - testPublisher.publish(topicSession.createTextMessage("message for topic")); - } - } - - @Name("testQueue") - public static class QueueBean { - @In - private QueueSender testSender; - - @In - private QueueSession queueSession; - - public void send() throws JMSException { - testSender.send(queueSession.createTextMessage("message for queue")); - } - } - - @MessageDriven(activationConfig={ - @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Topic"), - @ActivationConfigProperty(propertyName="destination", propertyValue="topic/test") - }) - @Name("testTopicListener") - static public class TestTopicListener - implements MessageListener - { - @In - private SimpleReference<String> testMessage; - - public void onMessage(Message msg) - { - try { - testMessage.setValue(((TextMessage) msg).getText()); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @MessageDriven(activationConfig={ - @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), - @ActivationConfigProperty(propertyName="destination", propertyValue="queue/test") - }) - @Name("testQueueListener") - static public class TestQueueListener - implements MessageListener - { - @In - private SimpleReference<String> testMessage; - - public void onMessage(Message msg) - { - try { - testMessage.setValue(((TextMessage) msg).getText()); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - - static class SimpleReference<T> { - T value; - public SimpleReference() { - } - public SimpleReference(T value) { - setValue(value); - } - public T getValue() { - return value; - } - public void setValue(T value) { - this.value = value; - } - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceResolverTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,64 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.init.NamespacePackageResolver; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.runner.RunWith; -import org.junit.Assert; -import org.junit.Test; - -(a)RunWith(Arquillian.class) -public class NamespaceResolverTest - extends JUnitSeamTest -{ - @Deployment(name="NamespaceResolverTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - NamespacePackageResolver resolver = new NamespacePackageResolver(); - - @Test - public void testResolver() { - - test("java:foo", "foo"); - test("java:com.company.department", - "com.company.department"); - test("java:com.company.department.product", - "com.company.department.product"); - test("http://www.company.com/department/product", - "com.company.department.product"); - test("https://my-company.com/department/product", - "com.my_company.department.product"); - test("http://ericjung:password@www.company.com:8080/foo/bar/baz#anchor?param1=3...", - "com.company.foo.bar.baz"); - test("http://cats.import.com", - "com.import.cats"); - - - //testFail("http://bar#foo#com"); - - testFail("java:"); - - // need to think about this one - //testFail("java:foo!bar"); - - testFail("mailto:java-net@java.sun.com"); - testFail("news:comp.lang.java"); - testFail("urn:isbn:096139210x"); - - } - - private void test(String namespace, String packageName) { - Assert.assertEquals(packageName, resolver.resolve(namespace)); - } - - private void testFail(String namespace) { - Assert.assertNull(namespace, resolver.resolve(namespace)); - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/NamespaceTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,106 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.core.Init; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -public class NamespaceTest - extends JUnitSeamTest -{ - @Test - public void nameSpaceComponent() - throws Exception - { - new ComponentTest() { - @Override - protected void testComponents() throws Exception { - assert getValue("#{namespaceTest.fooFactory}") != null; - } - }.run(); - } - - @Test - public void nameSpaceFactory() - throws Exception - { - new ComponentTest() { - @Override - protected void testComponents() throws Exception { - assert getValue("#{namespaceTest.ns1.factory}") != null; - } - }.run(); - } - - - @Test - public void namespaceOutjection() - throws Exception - { - new ComponentTest() { - @Override - protected void testComponents() throws Exception { - FooFactory factory = (FooFactory) getValue("#{namespaceTest.fooFactory}"); - factory.someMethod(); - assert getValue("#{namespaceTest.ns2.outject}") != null; - } - }.run(); - } - - - @Test - public void factoryMethodExpression() - throws Exception - { - new ComponentTest() { - @Override - protected void testComponents() throws Exception { - Init init = Init.instance(); - init.addFactoryMethodExpression("namespaceTest.ns3.factory", "#{namespaceTest.fooFactory.createFoo}", ScopeType.SESSION); - - assert getValue("#{namespaceTest.ns3.factory}") != null; - } - }.run(); - } - - @Test - public void factoryValueExpression() - throws Exception - { - new ComponentTest() { - @Override - protected void testComponents() throws Exception { - Init init = Init.instance(); - init.addFactoryValueExpression("namespaceTest.ns4.factory", "#{namespaceTest.fooFactory.createFoo()}", ScopeType.SESSION); - - assert getValue("#{namespaceTest.ns4.factory}") != null; - } - }.run(); - } - - @Name("namespaceTest.fooFactory") - public static class FooFactory { - public class Foo {} - - @Factory("namespaceTest.ns1.factory") - public Foo createFoo() { - return new Foo(); - } - - @Out("namespaceTest.ns2.outject") - public Foo outjectFoo() { - return new Foo(); - } - - public void someMethod() { - } - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageContextTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageContextTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageContextTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,49 +0,0 @@ -package org.jboss.seam.test.integration; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * - * @author Pete Muir - * - */ -(a)RunWith(Arquillian.class) -public class PageContextTest extends JUnitSeamTest -{ - @Deployment(name="PageContextTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - @Test - public void pageContextTest() throws Exception { - - new FacesRequest("/index.xhtml") { - - @Override - protected void invokeApplication() throws Exception - { - Contexts.getPageContext().set("foo", "bar"); - assert Contexts.getPageContext().get("foo") == null; - } - - @Override - protected void renderResponse() throws Exception - { - assert Contexts.getPageContext().get("foo") != null; - assert "bar".equals(Contexts.getPageContext().get("foo")); - } - }.run(); - - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageParamTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageParamTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/PageParamTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,125 +0,0 @@ -package org.jboss.seam.test.integration; - -import java.util.List; - -import javax.faces.application.FacesMessage; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * @author Pete Muir - * @author Dan Allen - */ -(a)RunWith(Arquillian.class) -public class PageParamTest extends JUnitSeamTest -{ - @Deployment(name="PageParamTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(Person.class); - } - - @Test - public void testPageParameter() throws Exception - { - new FacesRequest("/pageWithParameter.xhtml") - { - @Override - protected void beforeRequest() - { - setParameter("personName", "pete"); - } - - @Override - protected void invokeApplication() throws Exception - { - assert "pete".equals(getValue("#{person.name}")); - } - }.run(); - - new FacesRequest("/pageWithParameter.xhtml") - { - @Override - protected void beforeRequest() - { - setParameter("anotherPersonName", "pete"); - } - - @Override - protected void invokeApplication() throws Exception - { - assert getValue("#{person.name}") == null; - } - }.run(); - } - - @Test - public void testPageParameterFailsModelValidation() throws Exception - { - new FacesRequest("/pageWithParameter.xhtml") - { - @Override - protected void beforeRequest() - { - setParameter("personName", "pe"); - } - - @Override - protected void invokeApplication() throws Exception - { - List<FacesMessage> messages = (List<FacesMessage>) getValue("#{facesMessages.currentMessages}"); - assert messages.size() == 1; - assert messages.get(0).getDetail().startsWith("'personName' parameter is invalid"); - assert getValue("#{person.name}") == null; - } - }.run(); - } - - @Test - public void testPageParameterModelValidationDisabled() throws Exception - { - new FacesRequest("/pageWithValidateModelDisabledParameter.xhtml") - { - @Override - protected void beforeRequest() - { - setParameter("personName", "pe"); - } - - @Override - protected void invokeApplication() throws Exception - { - assert "pe".equals(getValue("#{person.name}")); - } - }.run(); - } - - @Test - public void testRequiredPageParameter() throws Exception - { - new FacesRequest("/pageWithRequiredParameter.xhtml") - { - @Override - protected void beforeRequest() - { - setParameter("personName", "pete"); - } - - @Override - protected void invokeApplication() throws Exception - { - assert "pete".equals(getValue("#{person.name}")); - } - }.run(); - - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/People.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/People.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/People.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,35 +0,0 @@ -package org.jboss.seam.test.integration; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.datamodel.DataModelSelection; - -@Name("people") -public class People -{ - @org.jboss.seam.annotations.datamodel.DataModel(scope=ScopeType.PAGE) - private List<Person> peopleList; - - @DataModelSelection - private Person selectedPerson; - - @Factory("peopleList") - public void peopleFactory() - { - peopleList = new ArrayList<Person>(); - peopleList.add(new Person("Gavin")); - peopleList.add(new Person("Pete")); - peopleList.add(new Person("Shane")); - peopleList.add(new Person("Norman")); - } - - public Person getSelectedPerson() - { - return selectedPerson; - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Person.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Person.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Person.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,47 +0,0 @@ -package org.jboss.seam.test.integration; - -import java.io.Serializable; -import javax.validation.constraints.Size; - -import org.jboss.seam.annotations.Name; - - -@Name("person") -public class Person implements Serializable -{ - - public Person(String name) - { - this.name = name; - } - - public Person() {} - - private String name; - - @Size(min = 3, max = 10) - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - @Override - public boolean equals(Object other) - { - if (other instanceof Person) - { - Person that = (Person) other; - return (this.name == null && that.name == null) || (this.name != null && this.name.equals(that.name)); - } - else - { - return false; - } - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Thing.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Thing.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/Thing.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,49 +0,0 @@ -package org.jboss.seam.test.integration; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; - -@Entity -public class Thing { - public Thing() {} - - @GeneratedValue - @Id - private Long id; - - @Version - private Integer version; - - private String name; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getVersion() { - return version; - } - - public void setVersion(Integer version) { - this.version = version; - } - - @Override - public String toString() { - return "Thing#" + id + "[v=" + version + "]"; - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/UnversionedThing.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/UnversionedThing.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/UnversionedThing.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,35 +0,0 @@ -package org.jboss.seam.test.integration; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -public class UnversionedThing { - @GeneratedValue - @Id - private Long id; - - private String name; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "UnversionedThing#" + id + "]"; - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,101 +0,0 @@ -package org.jboss.seam.test.integration.bpm; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.test.integration.Deployments; -import org.jboss.shrinkwrap.api.Archive; -import org.jbpm.jpdl.el.ELException; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * @author Pete Muir - * - */ -@Ignore -(a)RunWith(Arquillian.class) -public class SeamExpressionEvaluatorTest extends JUnitSeamTest -{ - @Deployment(name="SeamExpressionEvaluatorTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.jbpmSeamDeployment() - .addClasses(SeamExpressionEvaluatorTestController.class); - } - - // Test for JBSEAM-1937 - @Test - public void testValueExpression() throws Exception - { - new FacesRequest() - { - - @Override - protected void invokeApplication() throws Exception - { - invokeAction("#{seamExpressionEvaluatorTestController.createProcess2}"); - } - - }.run(); - } - - // Test for JBSEAM-3250 - @Test - public void testUnqualifiedValueExpression() throws Exception - { - new FacesRequest() - { - - @Override - protected void invokeApplication() throws Exception - { - invokeAction("#{seamExpressionEvaluatorTestController.createProcess4}"); - } - - }.run(); - } - - // Test for JBSEAM-2152 - @Test - public void testMissingMethod() throws Exception - { - new FacesRequest() - { - - @Override - protected void invokeApplication() throws Exception - { - try - { - invokeAction("#{seamExpressionEvaluatorTestController.createProcess3}"); - } - catch (Exception e) - { - if (!(isRootCause(e, ELException.class) || isRootCause(e, javax.el.ELException.class))) - { - e.printStackTrace(); - assert false; - } - } - } - - }.run(); - } - - private static boolean isRootCause(Throwable t, Class clazz) - { - for (Throwable cause = t.getCause(); cause != null && cause != cause.getCause(); cause = cause.getCause()) - { - if (clazz.isAssignableFrom(cause.getClass())) - { - return true; - } - } - return false; - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,50 +0,0 @@ -package org.jboss.seam.test.integration.bpm; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.bpm.CreateProcess; - -@Name("seamExpressionEvaluatorTestController") -public class SeamExpressionEvaluatorTestController { - - private String name = "foo"; - - @Factory(value="testBoolean", scope=ScopeType.BUSINESS_PROCESS) - public Boolean testNameFactory() - { - return false; - } - - @CreateProcess(definition="TestProcess2") - public void createProcess2() - { - } - - @CreateProcess(definition="TestProcess3") - public void createProcess3() - { - } - - @CreateProcess(definition="TestProcess4") - public void createProcess4() - { - } - - public void logTrue() - { - System.out.println("true"); - } - - public String getName() - { - return this.name; - } - - public void setName(String name) - { - this.name = name; - } - - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/databinding/DataModelTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,345 +0,0 @@ -package org.jboss.seam.test.integration.databinding; - - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.NotSerializableException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.faces.model.DataModel; -import javax.faces.model.ListDataModel; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.faces.DataModels; -import org.jboss.seam.jsf.ArrayDataModel; -import org.jboss.seam.jsf.MapDataModel; -import org.jboss.seam.jsf.SetDataModel; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.test.integration.Deployments; -import org.jboss.seam.test.integration.Foo; -import org.jboss.seam.test.integration.People; -import org.jboss.seam.test.integration.Person; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -(a)RunWith(Arquillian.class) -public class DataModelTest extends JUnitSeamTest -{ - @Deployment(name="DataModelTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment() - .addClasses(Foo.class, Person.class, People.class); - } - - @Test - public void testDataModels() throws Exception - { - - new FacesRequest() - { - @Override - protected void invokeApplication() throws Exception - { - DataModels dataModels = DataModels.instance(); - - assert dataModels.getDataModel(new ArrayList()) instanceof ListDataModel; - assert dataModels.getDataModel(new HashMap()) instanceof MapDataModel; - assert dataModels.getDataModel(new HashSet()) instanceof SetDataModel; - assert dataModels.getDataModel(new Object[0]) instanceof ArrayDataModel; - // TODO assert dataModels.getDataModel(query) instanceof ListDataModel; - - boolean failed = false; - try - { - dataModels.getDataModel(new Foo()); - } - catch (IllegalArgumentException e) - { - failed = true; - } - assert failed; - } - }.run(); - } - - @Test - public void testArrayDataModelSerialization() throws Exception - { - String[] array = {"Seam", "Hibernate"}; - javax.faces.model.ArrayDataModel arrayDataModel = new ArrayDataModel(array); - arrayDataModel.setRowIndex(1); - - Object object = null; - try - { - object = serialize(arrayDataModel); - } - catch (NotSerializableException e) - { - assert false; - } - assert object instanceof javax.faces.model.ArrayDataModel; - - javax.faces.model.ArrayDataModel serializedArrayDataModel = (javax.faces.model.ArrayDataModel) object; - - assert serializedArrayDataModel.getRowIndex() == 1; - - String[] serializedArray = (String[]) serializedArrayDataModel.getWrappedData(); - - assert array[0].equals(serializedArray[0]); - - assert array[1].equals(serializedArray[1]); - } - - // Utility to serialize an object - private Object serialize(Object object) throws Exception - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(object); - ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); - ObjectInputStream ois = new ObjectInputStream(bis); - return ois.readObject(); - } - - @Test - public void testListDataModelSerialization() throws Exception - { - - List<String> list = Arrays.asList("Seam", "Hibernate"); - javax.faces.model.ListDataModel listDataModel = new org.jboss.seam.jsf.ListDataModel(list); - listDataModel.setRowIndex(1); - - Object object = null; - try - { - object = serialize(listDataModel); - } - catch (NotSerializableException e) - { - assert false; - } - - assert object instanceof javax.faces.model.ListDataModel; - javax.faces.model.ListDataModel serializedListDataModel = (javax.faces.model.ListDataModel) object; - List<String> serializedList = (List<String>) serializedListDataModel.getWrappedData(); - - assert serializedListDataModel.getRowIndex() == 1; - assert list.get(0).equals(serializedList.get(0)); - assert list.get(1).equals(serializedList.get(1)); - } - - @Test - public void testMapDataModel() throws IOException, ClassNotFoundException - { - Map<String, Person> map = new HashMap<String, Person>(); - map.put("0", new Person("Gavin")); - map.put("1", new Person("Tom")); - - javax.faces.model.DataModel mapDataModel = new MapDataModel(); - - assert mapDataModel.getRowCount() == -1; - assert mapDataModel.getRowData() == null; - assert !mapDataModel.isRowAvailable(); - - mapDataModel = new MapDataModel(map); - - assert mapDataModel.getWrappedData() instanceof Map; - - assert map.get("0").equals(((Map) mapDataModel.getWrappedData()).get("0")); - assert map.get("1").equals(((Map) mapDataModel.getWrappedData()).get("1")); - - mapDataModel.setRowIndex(10); - - assert !mapDataModel.isRowAvailable(); - - boolean failed = false; - try - { - mapDataModel.getRowData(); - } - catch (IllegalArgumentException e) - { - failed = true; - } - - assert failed; - - mapDataModel.setRowIndex(1); - - assert mapDataModel.isRowAvailable(); - assert mapDataModel.getRowIndex() == 1; - assert mapDataModel.getRowCount() == 2; - - // JBSEAM-1660 - try - { - mapDataModel.setWrappedData(null); - } - catch (NullPointerException e) - { - // Spec allows passing null - assert false; - } - } - - /** - * JBSEAM-1659 - */ - @Test - public void testMapDataModelSerialization() throws Exception - { - - Map<String, Person> map = new HashMap<String, Person>(); - map.put("0", new Person("Gavin")); - map.put("1", new Person("Tom")); - - javax.faces.model.DataModel mapDataModel = new MapDataModel(map); - mapDataModel.setRowIndex(1); - - Object object = null; - try - { - object = serialize(mapDataModel); - } - catch (NotSerializableException e) - { - assert false; - } - - - assert object instanceof javax.faces.model.DataModel; - javax.faces.model.DataModel serializedMapDataModel = (javax.faces.model.DataModel) object; - Map<String, Person> serializedMap = (Map<String, Person>) serializedMapDataModel.getWrappedData(); - - assert serializedMapDataModel.getRowIndex() == 1; - assert map.get("0").equals(serializedMap.get("0")); - assert map.get("1").equals(serializedMap.get("1")); - } - - @Test - public void testSetDataModel() throws IOException, ClassNotFoundException - { - Person gavin = new Person("Gavin"); - Person tom = new Person("Tom"); - - Set<Person> set = new HashSet<Person>(); - set.add(gavin); - set.add(tom); - - javax.faces.model.DataModel setDataModel = new SetDataModel(); - - assert setDataModel.getRowCount() == -1; - assert setDataModel.getRowData() == null; - assert !setDataModel.isRowAvailable(); - - setDataModel = new SetDataModel(set); - - assert setDataModel.getWrappedData() instanceof Set; - - assert set.contains(gavin); - assert set.contains(tom); - - setDataModel.setRowIndex(10); - - assert !setDataModel.isRowAvailable(); - - boolean failed = false; - try - { - setDataModel.getRowData(); - } - catch (IllegalArgumentException e) - { - failed = true; - } - - assert failed; - - setDataModel.setRowIndex(1); - - assert setDataModel.isRowAvailable(); - assert setDataModel.getRowIndex() == 1; - assert setDataModel.getRowCount() == 2; - - // JBSEAM-1660 - try - { - setDataModel.setWrappedData(null); - } - catch (NullPointerException e) - { - // Spec allows passing null - assert false; - } - } - - @Test - public void testSetDataModelSerialization() throws Exception - { - - Person gavin = new Person("Gavin"); - Person tom = new Person("Tom"); - - Set<Person> set = new HashSet<Person>(); - set.add(gavin); - set.add(tom); - - javax.faces.model.DataModel setDataModel = new SetDataModel(set); - setDataModel.setRowIndex(1); - - Object object = null; - try - { - object = serialize(setDataModel); - } - catch (NotSerializableException e) - { - assert false; - } - - - assert object instanceof javax.faces.model.DataModel; - javax.faces.model.DataModel serializedSetDataModel = (javax.faces.model.DataModel) object; - Set<Person> serializedSet = (Set<Person>) serializedSetDataModel.getWrappedData(); - - assert serializedSetDataModel.getRowIndex() == 1; - assert serializedSet.contains(gavin); - assert serializedSet.contains(tom); - } - - @Test - public void testDataModelOutjection() throws Exception - { - new FacesRequest() - { - - @Override - protected void renderResponse() throws Exception - { - Object people = getValue("#{peopleList}"); - assert people instanceof DataModel; - DataModel dataModel = (DataModel) people; - assert dataModel.getRowCount() == 4; - dataModel.setRowIndex(1); - } - - }.run(); - - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/LocaleTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,140 +0,0 @@ -package org.jboss.seam.test.integration.i8ln; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - -import javax.faces.component.UIOutput; -import javax.faces.event.ValueChangeEvent; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.international.LocaleConfig; -import org.jboss.seam.international.LocaleSelector; -import org.jboss.seam.Seam; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.test.integration.Deployments; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -(a)RunWith(Arquillian.class) -public class LocaleTest extends JUnitSeamTest -{ - @Deployment(name="LocaleTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - @Test - public void localeTest() throws Exception - { - new NonFacesRequest() - { - @Override - protected void renderResponse() throws Exception - { - // it's necessary to emulate the startup behavior of LocaleConfig since it alters the JSF Application - // and we cannot be sure that the JSF Application wasn't cleared by an earlier class - // NOTE: I wish this test suite had some better place of initializing the application context - Contexts.getApplicationContext().remove(Seam.getComponentName(LocaleConfig.class)); - LocaleConfig.instance(); - } - }.run(); - - new FacesRequest() - { - - @Override - protected void invokeApplication() throws Exception - { - // <i18:locale-config default-locale="fr_CA" supported-locales="fr_CA fr_FR en"/> - List<Locale> supportedLocales = new ArrayList<Locale>(); - for (Iterator<Locale> iter = getFacesContext().getApplication().getSupportedLocales(); iter.hasNext();) - { - supportedLocales.add(iter.next()); - } - assert supportedLocales.size() == 3; - assert supportedLocales.contains(Locale.CANADA_FRENCH); - assert supportedLocales.contains(Locale.ENGLISH); - assert supportedLocales.contains(Locale.FRANCE); - assert getFacesContext().getApplication().getDefaultLocale().equals(Locale.CANADA_FRENCH); - - // why not? I guess be default locale means different things in different contexts (server vs user) - //assert org.jboss.seam.international.Locale.instance().equals(Locale.CANADA_FRENCH); - - // reset the locale configuration (as it would be w/o <i18n:locale-config>) - getFacesContext().getApplication().setDefaultLocale(Locale.ENGLISH); - getFacesContext().getApplication().setSupportedLocales(null); - - assert org.jboss.seam.international.Locale.instance().equals(Locale.getDefault()); - - LocaleSelector.instance().setLocale(Locale.UK); - - assert org.jboss.seam.international.Locale.instance().equals(Locale.UK); - - LocaleSelector.instance().setLocaleString(Locale.FRANCE.toString()); - - assert LocaleSelector.instance().getLanguage().equals(Locale.FRANCE.getLanguage()); - assert LocaleSelector.instance().getCountry().equals(Locale.FRANCE.getCountry()); - assert LocaleSelector.instance().getVariant().equals(Locale.FRANCE.getVariant()); - - assert org.jboss.seam.international.Locale.instance().equals(Locale.FRANCE); - assert LocaleSelector.instance().getLocaleString().equals(Locale.FRANCE.toString()); - - LocaleSelector.instance().select(); - assert org.jboss.seam.international.Locale.instance().equals(Locale.FRANCE); - - LocaleSelector.instance().selectLanguage(Locale.JAPANESE.getLanguage()); - assert org.jboss.seam.international.Locale.instance().getLanguage().equals(Locale.JAPANESE.getLanguage()); - - ValueChangeEvent valueChangeEvent = new ValueChangeEvent(new UIOutput(), Locale.JAPANESE.toString(), Locale.TAIWAN.toString()); - LocaleSelector.instance().select(valueChangeEvent); - assert org.jboss.seam.international.Locale.instance().equals(Locale.TAIWAN); - - Locale uk_posix = new Locale(Locale.UK.getLanguage(), Locale.UK.getCountry(), "POSIX"); - LocaleSelector.instance().setLocale(uk_posix); - - assert org.jboss.seam.international.Locale.instance().equals(uk_posix); - assert LocaleSelector.instance().getLanguage().equals(uk_posix.getLanguage()); - assert LocaleSelector.instance().getCountry().equals(uk_posix.getCountry()); - assert LocaleSelector.instance().getVariant().equals(uk_posix.getVariant()); - - LocaleSelector.instance().setLanguage(Locale.CHINA.getLanguage()); - LocaleSelector.instance().setCountry(Locale.CHINA.getCountry()); - LocaleSelector.instance().setVariant(null); - - assert org.jboss.seam.international.Locale.instance().equals(Locale.CHINA); - - LocaleSelector.instance().setLanguage(Locale.ITALIAN.getLanguage()); - LocaleSelector.instance().setCountry(null); - LocaleSelector.instance().setVariant(null); - - assert org.jboss.seam.international.Locale.instance().equals(Locale.ITALIAN); - - assert LocaleSelector.instance().getSupportedLocales().size() == 1; - assert LocaleSelector.instance().getSupportedLocales().get(0).getValue().equals(Locale.ENGLISH.toString()); - assert LocaleSelector.instance().getSupportedLocales().get(0).getLabel().equals(Locale.ENGLISH.getDisplayName()); - - boolean failed = false; - try - { - LocaleSelector.instance().setLocale(null); - } - catch (NullPointerException e) - { - failed = true; - } - assert failed; - - // TODO Test cookie stuff (need to extend Mocks for this) - - } - }.run(); - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/i8ln/TimeZoneTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,64 +0,0 @@ -package org.jboss.seam.test.integration.i8ln; - -import java.util.TimeZone; - -import javax.faces.component.UIOutput; -import javax.faces.event.ValueChangeEvent; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.international.TimeZoneSelector; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.test.integration.Deployments; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * - * @author Pete Muir - * - */ -(a)RunWith(Arquillian.class) -public class TimeZoneTest extends JUnitSeamTest -{ - @Deployment(name="TimeZoneTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - @Test - public void timeZoneTest() throws Exception - { - new FacesRequest() - { - @Override - protected void invokeApplication() throws Exception - { - assert org.jboss.seam.international.TimeZone.instance().equals(java.util.TimeZone.getDefault()); - - TimeZone cet = TimeZone.getTimeZone("CET"); - TimeZoneSelector.instance().setTimeZone(cet); - - assert org.jboss.seam.international.TimeZone.instance().equals(cet); - - TimeZoneSelector.instance().setTimeZoneId("CET"); - - assert org.jboss.seam.international.TimeZone.instance().equals(cet); - - TimeZoneSelector.instance().selectTimeZone("GMT"); - assert org.jboss.seam.international.TimeZone.instance().getID().equals("GMT"); - - ValueChangeEvent valueChangeEvent = new ValueChangeEvent(new UIOutput(), "GMT", "PST"); - TimeZoneSelector.instance().select(valueChangeEvent); - assert org.jboss.seam.international.TimeZone.instance().getID().equals("PST"); - - // TODO Test cookie stuff (need to extend Mocks for this) - - } - }.run(); - } -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamMockELResolverTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,166 +0,0 @@ -package org.jboss.seam.test.integration.mock; - -import java.beans.FeatureDescriptor; -import java.util.Iterator; - -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.ELResolver; -import javax.el.PropertyNotFoundException; -import javax.el.PropertyNotWritableException; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.test.integration.Deployments; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.runner.RunWith; -import org.junit.Test; - - -/** - * Test for adding EL resolvers to Seam MockFacesContext - * - * @author Pete Muir - * - */ -(a)RunWith(Arquillian.class) -public class SeamMockELResolverTest extends JUnitSeamTest -{ - @Deployment(name="SecurityTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - private static final String property = "customELResolverTest"; - - @Override - protected ELResolver[] getELResolvers() - { - ELResolver[] resolvers = new ELResolver[2]; - resolvers[0] = new ELResolver() - { - - @Override - public Class<?> getCommonPropertyType(ELContext arg0, Object arg1) - { - return null; - } - - @Override - public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext arg0, Object arg1) - { - return null; - } - - @Override - public Class<?> getType(ELContext arg0, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException - { - return null; - } - - @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException - { - if (SeamMockELResolverTest.property.equals(property)) - { - context.setPropertyResolved(true); - return "found"; - } - return null; - } - - @Override - public boolean isReadOnly(ELContext arg0, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException - { - if (SeamMockELResolverTest.property.equals(property)) - { - return false; - } - return false; - } - - @Override - public void setValue(ELContext context, Object base, Object property, Object value) - throws NullPointerException, PropertyNotFoundException, - PropertyNotWritableException, ELException - { - if (SeamMockELResolverTest.property.equals(property)) - { - throw new PropertyNotWritableException(); - } - } - - }; - resolvers[1] = new ELResolver() { - - @Override - public Class<?> getCommonPropertyType(ELContext arg0, Object arg1) - { - return null; - } - - @Override - public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext arg0, Object arg1) - { - return null; - } - - @Override - public Class<?> getType(ELContext arg0, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException - { - return null; - } - - @Override - public Object getValue(ELContext context, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException - { - if (base != null && "className".equals(property)) - { - context.setPropertyResolved(true); - return base.getClass().getSimpleName(); - } - return null; - } - - @Override - public boolean isReadOnly(ELContext arg0, Object base, Object property) - throws NullPointerException, PropertyNotFoundException, ELException - { - return true; - } - - @Override - public void setValue(ELContext context, Object base, Object property, Object value) - throws NullPointerException, PropertyNotFoundException, - PropertyNotWritableException, ELException - { - throw new PropertyNotWritableException(); - } - }; - return resolvers; - } - - @Test - public void testCustomELResolver() throws Exception - { - new FacesRequest() - { - @Override - protected void invokeApplication() throws Exception - { - assert "found".equals(getValue("#{" + property + "}")); - assert "String".equals(getValue("#{" + property + ".className}")); - } - }.run(); - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/mock/SeamTestTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,67 +0,0 @@ -package org.jboss.seam.test.integration.mock; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.test.integration.Action; -import org.jboss.seam.test.integration.Deployments; -import org.jboss.seam.test.integration.Person; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.runner.RunWith; -import org.junit.Test; - -public class SeamTestTest extends JUnitSeamTest -{ - private static final String PETER_NAME = "Pete Muir"; - private static final String PETER_USERNAME = "pmuir"; - - @Test - public void testEl() throws Exception - { - new FacesRequest() - { - - @Override - protected void updateModelValues() throws Exception - { - setValue("#{person.name}", PETER_NAME); - } - - @Override - protected void renderResponse() throws Exception - { - assert getValue("#{person.name}").equals(PETER_NAME); - } - - @Override - protected void invokeApplication() throws Exception - { - invokeAction("#{action.go}"); - String result = getOutcome(); - assert "success".equals(result); - } - }.run(); - } - - @Test - public void testSeamSecurity() throws Exception - { - new FacesRequest() - { - - @Override - protected void updateModelValues() throws Exception - { - setValue("#{identity.username}", PETER_USERNAME); - } - - @Override - protected void renderResponse() throws Exception - { - assert getValue("#{identity.username}").equals(PETER_USERNAME); - } - }.run(); - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/java/org/jboss/seam/test/integration/security/SecurityTest.java 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,182 +0,0 @@ -package org.jboss.seam.test.integration.security; - -import java.util.HashMap; - -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; -import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.Component; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.Lifecycle; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.seam.mock.MockLoginModule; -import org.jboss.seam.security.AuthorizationException; -import org.jboss.seam.security.Identity; -import org.jboss.seam.security.NotLoggedInException; -import org.jboss.seam.test.integration.Deployments; -import org.jboss.seam.web.Session; -import org.jboss.shrinkwrap.api.Archive; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * Seam Security Unit Tests - * - * @author Shane Bryzak - */ -(a)RunWith(Arquillian.class) -public class SecurityTest extends JUnitSeamTest -{ - @Deployment(name="SecurityTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - return Deployments.defaultSeamDeployment(); - } - - private Configuration createMockJAASConfiguration() - { - return new Configuration() - { - private AppConfigurationEntry[] aces = { new AppConfigurationEntry( - MockLoginModule.class.getName(), - LoginModuleControlFlag.REQUIRED, - new HashMap<String,String>() - ) }; - - @Override - public AppConfigurationEntry[] getAppConfigurationEntry(String name) - { - return aces; - } - - @Override - public void refresh() {} - }; - } - - public class MockIdentity extends Identity - { - @Override - protected LoginContext getLoginContext() throws LoginException - { - return new LoginContext("default", getSubject(), getCredentials().createCallbackHandler(), - createMockJAASConfiguration()); - } - } - - @Test - public void testLogin() - { - try - { - Lifecycle.beginApplication(new HashMap<String,Object>()); - Lifecycle.beginCall(); - - // Create a mock session - Contexts.getSessionContext().set(Component.getComponentName(Session.class), new Session()); - - Identity identity = new MockIdentity(); - identity.create(); - - // Put the identity into our session context - Contexts.getSessionContext().set(Component.getComponentName(Identity.class), identity); - - // Test addRole() - identity.addRole("admin"); - - assert(!identity.hasRole("admin")); - - try - { - // This should throw a NotLoggedInException - identity.checkRole("admin"); - assert(false); - } - catch (NotLoggedInException ex) - { - // expected - } - - identity.getCredentials().setUsername("foo"); - identity.getCredentials().setPassword("bar"); - - assert("foo".equals(identity.getCredentials().getUsername())); - assert("bar".equals(identity.getCredentials().getPassword())); - - assert("loggedIn".equals(identity.login())); - assert(identity.isLoggedIn()); - - // Pre-authenticated roles are cleared before authenticating, - // so this should still return false - assert(!identity.hasRole("admin")); - - // The foo role is added by MockLoginModule - assert(identity.hasRole("foo")); - - identity.removeRole("foo"); - assert(!identity.hasRole("foo")); - - try - { - // This should throw an AuthorizationException - identity.checkRole("foo"); - assert(false); - } - catch (AuthorizationException ex) - { - // expected - } - - // Now that we're authenticated, adding a role should have an immediate effect - identity.addRole("admin"); - assert(identity.hasRole("admin")); - - identity.logout(); - - assert(!identity.hasRole("admin")); - assert(!identity.isLoggedIn()); - } - finally - { - Lifecycle.endApplication(); - } - } - - @Test - public void testDisableSecurity() - { - try - { - Identity identity = new Identity(); - identity.create(); - - // Disable security - Identity.setSecurityEnabled(false); - - assert(!Identity.isSecurityEnabled()); - assert(identity.hasRole("admin")); - assert(identity.hasPermission("foo", "bar")); - - // This shouldn't throw an exception while security is disabled - identity.checkRestriction("foo"); - - // Enable security - Identity.setSecurityEnabled(true); - assert(Identity.isSecurityEnabled()); - assert(!identity.hasRole("admin")); - assert(!identity.hasPermission("foo", "bar")); - } - finally - { - Identity.setSecurityEnabled(true); - } - } - -} Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/persistence.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/META-INF/persistence.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<persistence xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - - <persistence-unit name="integration"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source> - <properties> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.cache.use_query_cache" value="false"/> - <property name="hibernate.cache.use_second_level_cache" value="false"/> - <property name="hibernate.show_sql" value="true"/> - <property name="jboss.entity.manager.factory.jndi.name" value="java:/integrationEntityManagerFactory"/> - </properties> - </persistence-unit> - -</persistence> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components-jbpm.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components-jbpm.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components-jbpm.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.com/products/seam/components" - xmlns:bpm="http://jboss.com/products/seam/bpm" - xmlns:core="http://jboss.com/products/seam/core" - xmlns:i18n="http://jboss.com/products/seam/international" - xmlns:security="http://jboss.com/products/seam/security" - xmlns:persistence="http://jboss.com/products/seam/persistence" - xmlns:web="http://jboss.com/products/seam/web" - xmlns:framework="http://jboss.com/products/seam/framework" - xmlns:jms="http://jboss.com/products/seam/jms" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd - http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.3.xsd - http://jboss.com/products/seam/international http://jboss.com/products/seam/international-2.3.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.3.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.3.xsd - http://jboss.com/products/seam/jms http://jboss.com/products/seam/jms-2.3.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd"> - - <core:init debug="false" jndi-pattern="@jndiPattern@" /> - - <core:manager concurrent-request-timeout="500" - conversation-timeout="120000" - conversation-id-parameter="cid"/> - - <i18n:locale-config default-locale="fr_CA" supported-locales="fr_CA fr_FR en"/> - - <persistence:managed-persistence-context name="entityManager" - auto-create="true" - persistence-unit-jndi-name="java:/integrationEntityManagerFactory" /> - - - <bpm:jbpm> - <bpm:process-definitions> - <value>testProcess1.jpdl.xml</value> - <value>testProcess2.jpdl.xml</value> - <value>testProcess3.jpdl.xml</value> - <value>testProcess4.jpdl.xml</value> - </bpm:process-definitions> - </bpm:jbpm> - - - <jms:topic-connection topic-connection-factory-jndi-name="/ConnectionFactory" /> - <jms:queue-connection queue-connection-factory-jndi-name="/ConnectionFactory" /> - - <jms:managed-topic-publisher name="testPublisher" - auto-create="true" - topic-jndi-name="/topic/testTopic" /> - - <jms:managed-queue-sender name="testSender" - auto-create="true" - queue-jndi-name="/queue/testQueue" /> - - -</components> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/components.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.com/products/seam/components" - xmlns:bpm="http://jboss.com/products/seam/bpm" - xmlns:core="http://jboss.com/products/seam/core" - xmlns:i18n="http://jboss.com/products/seam/international" - xmlns:security="http://jboss.com/products/seam/security" - xmlns:persistence="http://jboss.com/products/seam/persistence" - xmlns:web="http://jboss.com/products/seam/web" - xmlns:framework="http://jboss.com/products/seam/framework" - xmlns:jms="http://jboss.com/products/seam/jms" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation= - "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd - http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.3.xsd - http://jboss.com/products/seam/international http://jboss.com/products/seam/international-2.3.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd - http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.3.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.3.xsd - http://jboss.com/products/seam/jms http://jboss.com/products/seam/jms-2.3.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd"> - - <core:init debug="false" jndi-pattern="java:app/test/#{ejbName}" /> - - <core:manager concurrent-request-timeout="500" - conversation-timeout="120000" - conversation-id-parameter="cid"/> - - <i18n:locale-config default-locale="fr_CA" supported-locales="fr_CA fr_FR en"/> - - <persistence:managed-persistence-context name="entityManager" - auto-create="true" - persistence-unit-jndi-name="java:/integrationEntityManagerFactory" /> - - <jms:topic-connection topic-connection-factory-jndi-name="java:/ConnectionFactory" /> - <jms:queue-connection queue-connection-factory-jndi-name="java:/ConnectionFactory" /> - - <jms:managed-topic-publisher name="testPublisher" - auto-create="true" - topic-jndi-name="topic/test" /> - - <jms:managed-queue-sender name="testSender" - auto-create="true" - queue-jndi-name="queue/test" /> - - -</components> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/ejb-jar.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" - version="3.0"> - - <interceptors> - <interceptor> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor> - </interceptors> - - <assembly-descriptor> - <interceptor-binding> - <ejb-name>*</ejb-name> - <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> - </interceptor-binding> - </assembly-descriptor> - -</ejb-jar> \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/pages.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/pages.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" - no-conversation-view-id="/home.xhtml" - login-view-id="/login.xhtml"> - - <page view-id="/pageWithDescription.xhtml"> - <description>page description</description> - </page> - - <page view-id="/pageWithAnotherDescription.xhtml"> - <description>another page description</description> - </page> - - <page view-id="/pageWithParameter.xhtml"> - <param name="personName" value="#{person.name}" /> - </page> - - <page view-id="/pageWithRequiredParameter.xhtml"> - <param name="personName" value="#{person.name}" required="true"/> - </page> - - <page view-id="/pageWithValidateModelDisabledParameter.xhtml"> - <param name="personName" value="#{person.name}" validateModel="false"/> - </page> - - <exception class="org.jboss.seam.framework.EntityNotFoundException"> - <redirect view-id="/error.xhtml"> - <message>Not found</message> - </redirect> - </exception> - - <exception class="javax.persistence.EntityNotFoundException"> - <redirect view-id="/error.xhtml"> - <message>Not found</message> - </redirect> - </exception> - - <exception class="javax.persistence.OptimisticLockException"> - <end-conversation/> - <redirect view-id="/error.xhtml"> - <message>Another user changed the same data, please try again</message> - </redirect> - </exception> - - <exception class="org.jboss.seam.security.AuthorizationException"> - <redirect> - <message>You don't have permission to do this</message> - </redirect> - </exception> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/login.xhtml"> - <message>Please log in first</message> - </redirect> - </exception> - - <exception> - <redirect view-id="/error.xhtml"> - <message>Unexpected error, please try again</message> - </redirect> - </exception> -</pages> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/web.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/WEB-INF/web.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="3.0" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - -</web-app> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/components.properties =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/components.properties 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/components.properties 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,3 +0,0 @@ -# The pattern in components.xml is replaced by an application server specific value in the ant build. This value is used for running tests - -jndiPattern \#{ejbName}/local \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/hibernate.cfg.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/hibernate.cfg.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,175 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> - -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory> - - <property name="show_sql">false</property> - <property name="connection.datasource">java:jboss/datasources/ExampleDS</property> - <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="hbm2ddl.auto">create-drop</property> - - <property name="hibernate.cache.use_query_cache">false</property> - <property name="hibernate.cache.use_second_level_cache">false</property> - -  - -  -  -  - -  -  -  -  -  - <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> - -  -  -  -  -  -  -  - -  -  -  - - -  -  -  - - <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> - -  - <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - -  - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> - -  - <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> - <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> - <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> - -  - <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> - -  - <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> - <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> - -  - <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> - -  - <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> - -  - <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> - -  - <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> - -  - <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> - <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> - -  - <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> - <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> - -  - <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> - -  - <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> - <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - -  - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> - -  - <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> - -  - <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> - <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> - <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> - - </session-factory> -</hibernate-configuration> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jboss-seam-integration-tests-ds.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jboss-seam-integration-tests-ds.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jboss-seam-integration-tests-ds.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,18 +0,0 @@ -<?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>integrationDatasource</jndi-name> - <connection-url>jdbc:hsqldb:.</connection-url> - <driver-class>org.hsqldb.jdbcDriver</driver-class> - <user-name>sa</user-name> - <password></password> - </local-tx-datasource> - -</datasources> - Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jbpm.cfg.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jbpm.cfg.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/jbpm.cfg.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,18 +0,0 @@ -<jbpm-configuration> - - <jbpm-context> - <service name="persistence"> - <factory> - <bean class="org.jbpm.persistence.db.DbPersistenceServiceFactory"> - <field name="isTransactionEnabled"><false/></field> - </bean> - </factory> - </service> - <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> - <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> - <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> - <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> - <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" /> - </jbpm-context> - -</jbpm-configuration> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/messages_en.properties =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/messages_en.properties 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/messages_en.properties 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,116 +0,0 @@ -up=\u2191 -down=\u2193 -left=\u2039 -right=\u203A - -validator.assertFalse=validation failed -validator.assertTrue=validation failed -validator.future=must be a future date -validator.length=length must be between {min} and {max} -validator.max=must be less than or equal to {value} -validator.min=must be greater than or equal to {value} -validator.notNull=may not be null -validator.past=must be a past date -validator.pattern=must match "{regex}" -validator.range=must be between {min} and {max} -validator.size=size must be between {min} and {max} -validator.email=must be a well-formed email address - -org.jboss.seam.loginFailed=Login failed -org.jboss.seam.loginSuccessful=Welcome, #0 - -org.jboss.seam.TransactionFailed=Transaction failed -org.jboss.seam.NoConversation=The conversation ended, timed out or was processing another request -org.jboss.seam.IllegalNavigation=Illegal navigation -org.jboss.seam.ProcessEnded=Process #0 already ended -org.jboss.seam.ProcessNotFound=Process #0 not found -org.jboss.seam.TaskEnded=Task #0 already ended -org.jboss.seam.TaskNotFound=Task #0 not found -org.jboss.seam.NotLoggedIn=Please log in first - -javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type -javax.faces.component.UIInput.REQUIRED=value is required -javax.faces.component.UIInput.UPDATE=an error occurred when processing your submitted information -javax.faces.component.UISelectOne.INVALID=value is not valid -javax.faces.component.UISelectMany.INVALID=value is not valid - -javax.faces.converter.BigDecimalConverter.DECIMAL=value must be a number -javax.faces.converter.BigDecimalConverter.DECIMAL_detail=value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1} -javax.faces.converter.BigIntegerConverter.BIGINTEGER=value must be an integer -javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=value must be a signed integer number consisting of zero or more digits -javax.faces.converter.BooleanConverter.BOOLEAN=value must be true or false -javax.faces.converter.BooleanConverter.BOOLEAN_detail=value must be true or false (any value other than true will evaluate to false) -javax.faces.converter.ByteConverter.BYTE=value must be a number between 0 and 255 -javax.faces.converter.ByteConverter.BYTE_detail=value must be a number between 0 and 255 -javax.faces.converter.CharacterConverter.CHARACTER=value must be a character -javax.faces.converter.CharacterConverter.CHARACTER_detail=value must be a valid ASCII character -javax.faces.converter.DateTimeConverter.DATE=value must be a date -javax.faces.converter.DateTimeConverter.DATE_detail=value must be a date, eg. {1} -javax.faces.converter.DateTimeConverter.TIME=value must be a time -javax.faces.converter.DateTimeConverter.TIME_detail=value must be a time, eg. {1} -javax.faces.converter.DateTimeConverter.DATETIME=value must be a date and time -javax.faces.converter.DateTimeConverter.DATETIME_detail=value must be a date and time, eg. {1} -javax.faces.converter.DateTimeConverter.PATTERN_TYPE=a pattern or type attribute must be specified to convert the value -javax.faces.converter.DoubleConverter.DOUBLE=value must be a number -javax.faces.converter.DoubleConverter.DOUBLE_detail=value must be a number between 4.9E-324 and 1.7976931348623157E308 -javax.faces.converter.EnumConverter.ENUM=value must be convertible to an enum -javax.faces.converter.EnumConverter.ENUM_detail=value must be convertible to an enum or from the enum that contains the constant {1} -javax.faces.converter.EnumConverter.ENUM_NO_CLASS=value must be convertible to an enum or from the enum, but no enum class provided -javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=value must be convertible to an enum or from the enum, but no enum class provided -javax.faces.converter.FloatConverter.FLOAT=value must be a number -javax.faces.converter.FloatConverter.FLOAT_detail=value must be a number between 1.4E-45 and 3.4028235E38 -javax.faces.converter.IntegerConverter.INTEGER=value must be an integer -javax.faces.converter.IntegerConverter.INTEGER_detail=value must be an integer number between -2147483648 and 2147483647 -javax.faces.converter.LongConverter.LONG=value must be an integer -javax.faces.converter.LongConverter.LONG_detail=must be an integer number between -9223372036854775808 and 9223372036854775807 -javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount -javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1} -javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount -javax.faces.converter.NumberConverter.PERCENT_detail=value must be a percentage amount, eg. {1} -javax.faces.converter.NumberConverter.NUMBER=value must be a number -javax.faces.converter.NumberConverter.NUMBER_detail=value must be a number -javax.faces.converter.NumberConverter.PATTERN=value must be a number -javax.faces.converter.NumberConverter.PATTERN_detail=value must be a number -javax.faces.converter.ShortConverter.SHORT=value must be an integer -javax.faces.converter.ShortConverter.SHORT_detail=value must be an integer number between -32768 and 32767 - -javax.faces.validator.DoubleRangeValidator.MAXIMUM=value must be less than or equal to {0} -javax.faces.validator.DoubleRangeValidator.MINIMUM=value must be greater than or equal to {0} -javax.faces.validator.DoubleRangeValidator.NOT_IN_RANGE=value must be between {0} and {1} -javax.faces.validator.DoubleRangeValidator.TYPE=value is not of the correct type -javax.faces.validator.LengthValidator.MAXIMUM=value is must be shorter than or equal to {0} characters -javax.faces.validator.LengthValidator.MINIMUM=value is must be longer than or equal to {0} characters -javax.faces.validator.LongRangeValidator.MAXIMUM=value must be less than or equal to {0} -javax.faces.validator.LongRangeValidator.MINIMUM=value must be greater than or equal to {0} -javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=value must be between {0} and {1} -javax.faces.validator.LongRangeValidator.TYPE=value is not of the correct type - -javax.faces.validator.NOT_IN_RANGE=value must be between {0} and {1} -javax.faces.converter.STRING=value could not be converted to a string - -#JSF 1.1: -javax.faces.convert.BigDecimalConverter.CONVERSION value must be a number -javax.faces.convert.BigDecimalConverter.CONVERSION_detail value must be a number -javax.faces.convert.BigIntegerConverter.CONVERSION value must be an integre -javax.faces.convert.BigIntegerConverter.CONVERSION_detail value must be a number -javax.faces.convert.BooleanConverter.CONVERSION value must be true or false -javax.faces.convert.BooleanConverter.CONVERSION_detail value must be true or false -javax.faces.convert.ByteConverter.CONVERSION value must be a byte -javax.faces.convert.ByteConverter.CONVERSION_detail value must be a byte -javax.faces.convert.CharacterConverter.CONVERSION value must be a character -javax.faces.convert.CharacterConverter.CONVERSION_detail value must be a character -javax.faces.convert.DateTimeConverter.CONVERSION value must be a datetime -javax.faces.convert.DateTimeConverter.CONVERSION_detail value must be a datetime -javax.faces.convert.DoubleConverter.CONVERSION value must be a number -javax.faces.convert.DoubleConverter.CONVERSION_detail value must be a number -javax.faces.convert.FloatConverter.CONVERSION value must be a number -javax.faces.convert.FloatConverter.CONVERSION_detail value must be a number -javax.faces.convert.IntegerConverter.CONVERSION value must be an integer -javax.faces.convert.IntegerConverter.CONVERSION_detail value must be an integer -javax.faces.convert.LongConverter.CONVERSION value must be an integer -javax.faces.convert.LongConverter.CONVERSION_detail value must be a long integer -javax.faces.convert.NumberConverter.CONVERSION value must be a number -javax.faces.convert.NumberConverter.CONVERSION_detail value must be a number -javax.faces.convert.ShortConverter.CONVERSION value must be an integer -javax.faces.convert.ShortConverter.CONVERSION_detail value must be a short integer -descriptionError=Less than \#{disc.name} \ No newline at end of file Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/seam.properties =================================================================== Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/test-destinations-service.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/test-destinations-service.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/test-destinations-service.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,17 +0,0 @@ -<server> - <mbean code="org.jboss.mq.server.jmx.Topic" - name="jboss.mq.destination:service=Topic,name=testTopic"> - <depends optional-attribute-name="ServerPeer"> - jboss.messaging:service=ServerPeer - </depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> - - <mbean code="org.jboss.mq.server.jmx.Queue" - name="jboss.mq.destination:service=Queue,name=testQueue"> - <depends optional-attribute-name="ServerPeer"> - jboss.messaging:service=ServerPeer - </depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> -</server> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess1.jpdl.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess1.jpdl.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess1.jpdl.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,12 +0,0 @@ -<process-definition name="TestProcess1" - xmlns="urn:jbpm.org:jpdl-3.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd"> - - <start-state name="start"> - <transition to="done"/> - </start-state> - - <end-state name="done"/> - -</process-definition> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess2.jpdl.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess2.jpdl.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess2.jpdl.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,17 +0,0 @@ -<process-definition name="TestProcess2" - xmlns="urn:jbpm.org:jpdl-3.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd"> - - <start-state name="start"> - <transition to="decision" /> - </start-state> - - <decision name="decision" expression="#{seamExpressionEvaluatorTestController.name eq 'foo'}"> - <transition to="done" name="true" /> - <transition to="done" name="false" /> - </decision> - - <end-state name="done"/> - -</process-definition> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess3.jpdl.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess3.jpdl.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess3.jpdl.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,14 +0,0 @@ -<process-definition name="TestProcess3" - xmlns="urn:jbpm.org:jpdl-3.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd"> - - <start-state name="start"> - <transition to="done"> - <action expression="#{seamExpressionEvaluatorTestController.nonExistentMethod}" /> - </transition> - </start-state> - - <end-state name="done"/> - -</process-definition> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess4.jpdl.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess4.jpdl.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources/testProcess4.jpdl.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,19 +0,0 @@ -<process-definition name="TestProcess4" - xmlns="urn:jbpm.org:jpdl-3.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd"> - - <start-state name="start"> - <transition to="decision" /> - </start-state> - - <decision name="decision" expression="#{testBoolean}"> - <transition to="done" name="true"> - <action expression="#{seamExpressionEvaluatorTestController.logTrue}" /> - </transition> - <transition to="done" name="false" /> - </decision> - - <end-state name="done"/> - -</process-definition> Deleted: branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml 2012-03-14 17:37:22 UTC (rev 14390) +++ branches/community/Seam_2_3/seam-integration-tests-ee6/src/test/resources-jbossas-7/arquillian.xml 2012-03-14 17:39:25 UTC (rev 14391) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://jboss.org/schema/arquillian" - xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> - - <engine> - <property name="deploymentExportPath">target/</property> - </engine> - - <container qualifier="jboss" default="true"> - <configuration> - <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> - <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> - <property name="serverConfig">standalone-full.xml</property> - </configuration> - </container> - -</arquillian>

14 years

1
0
0 / 0

Seam SVN: r14390 - in branches/community/Seam_2_3: jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet and 19 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:37:22 -0400 (Wed, 14 Mar 2012) New Revision: 14390 Removed: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/README branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicBooleanConverter.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicIntegerConverter.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicLongConverter.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/button.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/cache.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationId.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationName.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationPropagation.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertDateTime.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEntity.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEnum.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/decorate.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/defaultAction.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/div.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/download.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/enumItem.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/equalityValidator.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fileUpload.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedText.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedTextValidator.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fragment.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/graphicImage.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/label.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/link.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/message.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/modelValidator.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/remote.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/resource.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selectItems.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selection.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/span.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/taskId.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/token.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageBlur.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageSize.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageType.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/validateAll.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/AbstractEntityLoader.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/ClientUidSelector.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityIdentifierStore.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/HibernateEntityLoader.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/JpaEntityLoader.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/RenderStampStore.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/UnauthorizedCommandException.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIAction.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIButton.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UICache.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationId.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationName.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDecorate.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDownload.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFragment.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILabel.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILink.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIMessage.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIRemote.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIResource.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelectItems.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelection.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISpan.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIStyle.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UITaskId.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIToken.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererFacesContextFactory.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageResource.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageStore.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/Image.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/ImageTransform.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/package-info.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/StyleRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/resource/WebResource.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Decoration.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Faces.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/HTML.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/JSF.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/UrlBuilder.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodExpressionToMethodBinding.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererUtils.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/SimpleActionMethodBinding.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/javadoc/jdstyle.css branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/resources/META-INF/components.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/templates/README branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicBooleanConverterTest.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicIntegerConverterTest.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicLongConverterTest.java branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/UrlBuilderTest.java Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java Log: jboss-seam-ui-jsf2 renamed to jboss-seam-ui Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -6,9 +6,8 @@ <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - <name>Seam UI</name> + <artifactId>jboss-seam-ui-jsf2</artifactId> + <name>Seam UI JSF2 support</name> <build>  @@ -85,7 +84,7 @@ <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> + <artifactId>jboss-seam-jsf2</artifactId> <type>ejb</type> </dependency> @@ -118,20 +117,21 @@ <optional>true</optional> </dependency> -  <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <optional>true</optional> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> - + <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jbpm</groupId> <artifactId>jbpm-jpdl</artifactId> @@ -144,33 +144,14 @@ </exclusions> </dependency> -  <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <optional>true</optional> - </dependency> - -  - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <optional>true</optional> - </dependency> - - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <optional>true</optional> + <version>4.0.1.Final</version> </dependency> <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <optional>true</optional> - </dependency> - - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <scope>provided</scope> @@ -181,17 +162,12 @@ <artifactId>commons-beanutils</artifactId> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <optional>true</optional> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> <optional>true</optional> + <version>4.2.0.Final</version> </dependency> <dependency> @@ -202,46 +178,7 @@ </dependency> </dependencies> <profiles> - <profile> - <id>jsf2_0</id> - <build> - <plugins> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>false</skip> - </configuration> - </plugin> - </plugins> - <resources> - <resource> - <directory>src/main/resources-jsf20</directory> - </resource> - </resources> - </build> - <dependencies> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.0.5-b02</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> <profile> - <id>jsf1_2</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> <id>code-coverage</id> <build> <plugins> Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,17 +1,7 @@ package org.jboss.seam.ui.facelet; -import static com.sun.facelets.FaceletViewHandler.PARAM_DECORATORS; -import static com.sun.facelets.FaceletViewHandler.PARAM_LIBRARIES; -import static com.sun.facelets.FaceletViewHandler.PARAM_SKIP_COMMENTS; import static org.jboss.seam.ScopeType.APPLICATION; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URL; - -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; - import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.AutoCreate; @@ -22,114 +12,50 @@ import org.jboss.seam.annotations.Unwrap; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import com.sun.facelets.compiler.Compiler; -import com.sun.facelets.compiler.SAXCompiler; -import com.sun.facelets.compiler.TagLibraryConfig; -import com.sun.facelets.tag.TagDecorator; -import com.sun.facelets.tag.TagLibrary; -import com.sun.facelets.util.ReflectionUtil; +import com.sun.faces.application.ApplicationAssociate; +import com.sun.faces.facelets.compiler.SAXCompiler; -@Name("org.jboss.seam.ui.facelet.faceletCompiler") +@Name("org.jboss.seam.ui.faces.facelet.faceletCompiler") @Scope(APPLICATION) @BypassInterceptors @AutoCreate -@Install(value = true, precedence = Install.BUILT_IN, classDependencies="com.sun.facelets.Facelet") +@Install(value = true, precedence = Install.BUILT_IN, classDependencies="com.sun.faces.facelets.Facelet") public class FaceletCompiler { - private LogProvider log = Logging.getLogProvider(FaceletCompiler.class); - private Compiler compiler; + private com.sun.faces.facelets.compiler.Compiler compiler; @Create public void create() { - compiler = new SAXCompiler(); - // fill the necessary parameters - initializeCompiler(compiler); + ApplicationAssociate applicationAssociate = ApplicationAssociate.getCurrentInstance(); + if (applicationAssociate != null) + { + compiler = applicationAssociate.getCompiler(); + } + else + { + // TODO: this requires to initialize custom tag library + compiler = new SAXCompiler(); + } } + - /* - * This method cribbed from FaceletViewHandler - */ - protected void initializeCompiler(Compiler compiler) - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - ExternalContext externalContext = facesContext.getExternalContext(); - - // load libraries - String libraryParameter = externalContext.getInitParameter(PARAM_LIBRARIES); - if (libraryParameter != null) - { - libraryParameter = libraryParameter.trim(); - String[] libraries = libraryParameter.split(";"); - URL src; - TagLibrary libraryObject; - for (int i = 0; i < libraries.length; i++) - { - try - { - src = externalContext.getResource(libraries[i].trim()); - if (src == null) - { - throw new FileNotFoundException(libraries[i]); - } - libraryObject = TagLibraryConfig.create(src); - compiler.addTagLibrary(libraryObject); - log.trace("Successfully Loaded Library: " + libraries[i]); - } - catch (IOException e) - { - log.error("Error Loading Library: " + libraries[i], e); - } - } - } - - // load decorators - String decoratorParameter = externalContext.getInitParameter(PARAM_DECORATORS); - if (decoratorParameter != null) - { - decoratorParameter = decoratorParameter.trim(); - String[] decorators = decoratorParameter.split(";"); - TagDecorator decoratorObject; - for (int i = 0; i < decorators.length; i++) - { - try - { - decoratorObject = (TagDecorator) ReflectionUtil.forName(decorators[i]).newInstance(); - compiler.addTagDecorator(decoratorObject); - log.trace("Successfully Loaded Decorator: " + decorators[i]); - } - catch (Exception e) - { - log.error("Error Loading Decorator: " + decorators[i], e); - } - } - } - - // skip params? - String skipParameters = externalContext.getInitParameter(PARAM_SKIP_COMMENTS); - if (skipParameters != null && "true".equals(skipParameters)) - { - compiler.setTrimmingComments(true); - } - } - @Unwrap - public Compiler unwrap() + public com.sun.faces.facelets.compiler.Compiler unwrap() { return compiler; } - public static Compiler instance() + public static com.sun.faces.facelets.compiler.Compiler instance() { if ( !Contexts.isApplicationContextActive() ) { throw new IllegalStateException("No active application scope"); } - return (Compiler) Component.getInstance(FaceletCompiler.class, ScopeType.APPLICATION); + return (com.sun.faces.facelets.compiler.Compiler) Component.getInstance(FaceletCompiler.class, ScopeType.APPLICATION); } } + Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -18,15 +18,14 @@ import org.jboss.seam.log.Logging; import org.jboss.seam.util.Reflections; -import com.sun.facelets.FaceletViewHandler; -import com.sun.facelets.compiler.TagLibraryConfig; -import com.sun.facelets.impl.DefaultFaceletFactory; -import com.sun.facelets.tag.jsf.ComponentHandler; -import com.sun.facelets.util.Resource; +import com.sun.faces.facelets.impl.DefaultFaceletFactory; +import com.sun.faces.facelets.tag.jsf.core.ViewHandler; +import com.sun.faces.facelets.util.Resource; +import javax.faces.view.facelets.ComponentHandler; @Name("org.jboss.seam.ui.facelet.faceletsJBossLogging") @Scope(APPLICATION) -@Install(classDependencies={"com.sun.facelets.Facelet", "org.jboss.logging.Logger", "org.apache.log4j.Logger", "org.jboss.seam.interop.jul.Log4JConversionFilter"}, precedence=BUILT_IN) +@Install(classDependencies={"com.sun.faces.facelets.Facelet", "org.jboss.logging.Logger", "org.apache.log4j.Logger", "org.jboss.seam.interop.jul.Log4JConversionFilter"}, precedence=BUILT_IN) @Startup @BypassInterceptors public class FaceletsJBossLogging @@ -58,37 +57,37 @@ // And some aren't static, so this really is best effort - julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log"); - julLogger.setFilter(conversionFilter); +// julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log"); +// julLogger.setFilter(conversionFilter); - julLogger = getPrivateStaticLogger(com.sun.facelets.compiler.Compiler.class, "log"); + julLogger = getPrivateStaticLogger(com.sun.faces.facelets.compiler.Compiler.class, "log"); julLogger.setFilter(conversionFilter); julLogger = getPrivateStaticLogger(DefaultFaceletFactory.class, "log"); julLogger.setFilter(conversionFilter); - julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log"); - julLogger.setFilter(conversionFilter); +// julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log"); +// julLogger.setFilter(conversionFilter); - julLogger = getPrivateStaticLogger(ComponentHandler.class, "log"); - julLogger.setFilter(conversionFilter); +// julLogger = getPrivateStaticLogger(ComponentHandler.class, "log"); +// julLogger.setFilter(conversionFilter); julLogger = getPrivateStaticLogger(Resource.class, "log"); julLogger.setFilter(conversionFilter); - julLogger = getPrivateStaticLogger(FaceletViewHandler.class, "log"); - julLogger.setFilter(conversionFilter); +// julLogger = getPrivateStaticLogger(ViewHandler.class, "log"); +// julLogger.setFilter(conversionFilter); // These ones are in a package-scoped class - julLogger = getPrivateStaticLogger("com.sun.facelets.compiler.CompilationManager", "log"); + julLogger = getPrivateStaticLogger("com.sun.faces.facelets.compiler.CompilationManager", "log"); julLogger.setFilter(conversionFilter); - julLogger = getPrivateStaticLogger("com.sun.facelets.tag.jsf.ComponentRule", "log"); + julLogger = getPrivateStaticLogger("com.sun.faces.facelets.tag.jsf.ComponentRule", "log"); julLogger.setFilter(conversionFilter); - julLogger = getPrivateStaticLogger("com.sun.facelets.tag.MetaRulesetImpl", "log"); - julLogger.setFilter(conversionFilter); +// julLogger = getPrivateStaticLogger("com.sun.faces.facelets.tag.MetaRulesetImpl", "log"); +// julLogger.setFilter(conversionFilter); } catch (Exception e) Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -25,7 +25,7 @@ @BypassInterceptors @Name("org.jboss.seam.faces.renderer") @AutoCreate -@Install(value = true, precedence = Install.BUILT_IN, classDependencies="com.sun.facelets.Facelet") +@Install(value = true, precedence = Install.BUILT_IN, classDependencies="com.sun.faces.facelets.Facelet") public class FaceletsRenderer extends Renderer { Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -10,16 +10,15 @@ import javax.servlet.ServletContext; import org.jboss.seam.core.ResourceLoader; +import org.jboss.seam.jsf.DelegatingFacesContext; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; -import org.jboss.seam.jsf.DelegatingFacesContext; import org.jboss.seam.mock.MockHttpServletRequest; import org.jboss.seam.mock.MockHttpServletResponse; import org.jboss.seam.ui.util.JSF; -import com.sun.facelets.Facelet; -import com.sun.facelets.impl.DefaultFaceletFactory; -import com.sun.facelets.impl.DefaultResourceResolver; +import com.sun.faces.application.ApplicationAssociate; +import com.sun.faces.facelets.Facelet; public class RendererRequest { @@ -126,8 +125,7 @@ { throw new IllegalArgumentException("resource doesn't exist: " + viewId); } - return new DefaultFaceletFactory(FaceletCompiler.instance(), new DefaultResourceResolver()) - .getFacelet(url); + return ApplicationAssociate.getCurrentInstance().getFaceletFactory().getFacelet(url); } /** Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -3,12 +3,11 @@ import javax.faces.component.UIComponent; import javax.faces.component.UIViewRoot; +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.FaceletContext; import static org.jboss.seam.ui.util.cdk.RendererBase.getUtils; -import com.sun.facelets.FaceletContext; -import com.sun.facelets.tag.jsf.ComponentConfig; -import com.sun.facelets.tag.jsf.ComponentHandler; - /** * If user didn't specify id on button, do it for them (we need one rendered) * @@ -24,7 +23,7 @@ } @Override - protected void onComponentCreated(FaceletContext ctx, UIComponent c, + public void onComponentCreated(FaceletContext ctx, UIComponent c, UIComponent parent) { if (getUtils().isCommandButton(parent) && parent.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -5,26 +5,25 @@ import javax.el.ELException; import javax.faces.FacesException; import javax.faces.component.UIComponent; +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.FaceletContext; -import com.sun.facelets.FaceletContext; -import com.sun.facelets.tag.jsf.ComponentConfig; -import com.sun.facelets.tag.jsf.ComponentHandler; - public class DecorateHandler extends ComponentHandler { - private com.sun.facelets.tag.ui.DecorateHandler delegate; + private com.sun.faces.facelets.tag.ui.DecorateHandler delegate; public DecorateHandler(ComponentConfig config) { super(config); if ( tag.getAttributes().get("template")!=null ) { - delegate = new com.sun.facelets.tag.ui.DecorateHandler(config); + delegate = new com.sun.faces.facelets.tag.ui.DecorateHandler(config); } } @Override - protected void applyNextHandler(FaceletContext context, UIComponent component) + public void applyNextHandler(FaceletContext context, UIComponent component) throws IOException, FacesException, ELException { if ( tag.getAttributes().get("template")!=null ) Modified: branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,5 +1,7 @@ package org.jboss.seam.ui.validator; +import java.util.Set; + import javax.el.ELException; import javax.el.ValueExpression; import javax.faces.application.FacesMessage; @@ -8,9 +10,9 @@ import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; -import org.hibernate.validator.InvalidValue; import org.jboss.seam.core.Validators; import org.jboss.seam.faces.FacesMessages; +import javax.validation.ConstraintViolation; /** * Validates using Hibernate Validator model-based annotations. @@ -29,7 +31,7 @@ if (valueExpression != null) { //TODO: note that this code is duplicated to Param.getValueFromRequest()!! - InvalidValue[] invalidValues; + Set<ConstraintViolation<Object>> invalidValues; try { invalidValues = Validators.instance().validate( valueExpression, facesContext.getELContext(), value ); @@ -41,16 +43,17 @@ throw new ValidatorException(createMessage(cause), cause); } - if ( invalidValues!=null && invalidValues.length>0 ) + if ( invalidValues!=null && invalidValues.size()>0 ) { throw new ValidatorException(createMessage(invalidValues, resolveLabel(facesContext, component))); } } } - private FacesMessage createMessage(InvalidValue[] invalidValues, Object label) + private FacesMessage createMessage(Set<ConstraintViolation<Object>> invalidValues, Object label) { - return FacesMessages.createFacesMessage(FacesMessage.SEVERITY_ERROR, invalidValues[0].getMessage(), label); + String message = invalidValues.iterator().next().getMessage(); + return FacesMessages.createFacesMessage(FacesMessage.SEVERITY_ERROR, message, label); } private FacesMessage createMessage(Throwable cause) Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/README =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicBooleanConverter.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicBooleanConverter.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicBooleanConverter.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <converter generate="false"> - <id>org.jboss.seam.ui.AtomicBooleanConverter</id> - <classname>org.jboss.seam.ui.converter.AtomicBooleanConverter</classname> - <description> - <![CDATA[Converter for java.util.concurrent.atomic.AtomicBoolean]]> - </description> - <tag> - <name>convertAtomicBoolean</name> - <classname>org.jboss.seam.ui.taglib.AtomicBooleanTag</classname> - <superclass> - javax.faces.webapp.ConverterELTag - </superclass> - </tag> - </converter> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicIntegerConverter.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicIntegerConverter.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicIntegerConverter.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <converter generate="false"> - <id>org.jboss.seam.ui.AtomicIntegerConverter</id> - <classname>org.jboss.seam.ui.converter.AtomicIntegerConverter</classname> - <description> - <![CDATA[Converter for java.util.concurrent.atomic.AtomicInteger]]> - </description> - <tag> - <name>convertAtomicInteger</name> - <classname>org.jboss.seam.ui.taglib.AtomicIntegerTag</classname> - <superclass> - javax.faces.webapp.ConverterELTag - </superclass> - </tag> - </converter> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicLongConverter.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicLongConverter.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/atomicLongConverter.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <converter generate="false"> - <id>org.jboss.seam.ui.AtomicLongConverter</id> - <classname>org.jboss.seam.ui.converter.AtomicLongConverter</classname> - <description> - <![CDATA[Converter for java.util.concurrent.atomic.AtomicLong]]> - </description> - <tag> - <name>convertAtomicLong</name> - <classname>org.jboss.seam.ui.taglib.AtomicLongTag</classname> - <superclass> - javax.faces.webapp.ConverterELTag - </superclass> - </tag> - </converter> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/button.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/button.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/button.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Button</name> - <family>org.jboss.seam.ui.Button</family> - <classname>org.jboss.seam.ui.component.html.HtmlButton</classname> - <superclass>org.jboss.seam.ui.component.UIButton</superclass> - <description> - <![CDATA[A link that supports invocation of an action with control over conversation propagation. <i>Does not submit the form.</i>]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.ButtonRenderer</name> - <classname>org.jboss.seam.ui.renderkit.ButtonRendererBase</classname> - </renderer> - <tag> - <name>button</name> - <classname>org.jboss.seam.ui.taglib.ButtonTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_output_attributes; - &html_button_attributes; - &html_universal_attributes; - &html_events; - &ui_command_attributes; - <property> - <name>view</name> - <classname>java.lang.String</classname> - <description>the JSF view id to link to.</description> - </property> - <property> - <name>pageflow</name> - <classname>java.lang.String</classname> - <description>a pageflow definition to begin. (This is only useful when propagation="begin" or propagation="join".)</description> - </property> - <property el="false"> - <name>propagation</name> - <classname>java.lang.String</classname> - <description>determines the conversation propagation style: begin, join, nest, none, end or endRoot.</description> - <defaultvalue>"default"</defaultvalue> - </property> - <property transient="true"> - <name>fragment</name> - <classname>java.lang.String</classname> - <description>the fragment identifier to link to.</description> - </property> - <property transient="true" el="false"> - <name>outcome</name> - <classname>java.lang.String</classname> - </property> - <property transient="false"> - <name>image</name> - <classname>java.lang.String</classname> - </property> - <property elonly="true" transient="true" > - <name>taskInstance</name> - <classname>java.lang.Object</classname> - <description>Specify the task to operate on (e.g. for @StartTask)</description> - </property> - <property> - <name>conversationName</name> - <classname>java.lang.String</classname> - <description>The name of the conversation for natural conversations</description> - </property> - <property> - <name>includePageParams</name> - <classname>boolean</classname> - <description>Include page parameters defined in pages.xml when rendering the button</description> - <defaultvalue>true</defaultvalue> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/cache.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/cache.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/cache.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Cache</name> - <family>org.jboss.seam.ui.Cache</family> - <classname>org.jboss.seam.ui.component.html.HtmlCache</classname> - <superclass>org.jboss.seam.ui.component.UICache</superclass> - <description> - <![CDATA[Cache the rendered page fragment using the installed cache provider.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.CacheRenderer</name> - <classname>org.jboss.seam.ui.renderkit.CacheRendererBase</classname> - </renderer> - <tag> - <name>cache</name> - <classname>org.jboss.seam.ui.taglib.CacheTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_component_attributes; - <property> - <name>key</name> - <classname>java.lang.String</classname> - <description>the key to cache rendered content, often a value expression. For example, if we were caching a page fragment that displays a document, we might use key="Document-#{document.id}".</description> - </property> - <property> - <name>region</name> - <classname>java.lang.String</classname> - <description>a cache node to use (different nodes can have different expiry policies).</description> - </property> - <property elonly="true"> - <name>cacheProvider</name> - <classname>org.jboss.seam.cache.CacheProvider</classname> - <description>The cache provider to use, only needed if you install alter the default cache provider in an application where multiple cache providers are in use</description> - <defaultvalue>org.jboss.seam.cache.CacheProvider.instance()</defaultvalue> - </property> - <property elonly="true"> - <name>enabled</name> - <classname>boolean</classname> - <description>a value expression that determines if the cache should be used.</description> - <defaultvalue>true</defaultvalue> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationId.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationId.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationId.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.ConversationId</name> - <family>org.jboss.seam.ui.ConversationId</family> - <classname>org.jboss.seam.ui.component.html.HtmlConversationId</classname> - <superclass>org.jboss.seam.ui.component.UIConversationId</superclass> - <description> - <![CDATA[Add the conversation id to JSF link or button (e.g. <h:commandLink />, <s:button />).]]> - </description> - <tag> - <name>conversationId</name> - <classname>org.jboss.seam.ui.taglib.ConversationIdTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_parameter_attributes; - <property hidden="true" el="false" transient="true"> - <name>viewId</name> - <classname>java.lang.String</classname> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationName.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationName.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationName.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.ConversationName</name> - <family>org.jboss.seam.ui.ConversationName</family> - <classname>org.jboss.seam.ui.component.html.HtmlConversationName</classname> - <superclass>org.jboss.seam.ui.component.UIConversationName</superclass> - - <description> - <![CDATA[Set the conversation name for a command link or button (or similar JSF control).]]> - </description> - <renderer generate="false"> - <name>org.jboss.seam.ui.ConversationNameRenderer</name> - <classname>org.jboss.seam.ui.renderkit.ConversationNameRendererBase</classname> - </renderer> - <tag generate="true"> - <name>conversationName</name> - <classname>org.jboss.seam.ui.taglib.ConversationNameTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <taghandler> - <classname>org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler</classname> - </taghandler> - &ui_parameter_attributes; - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationPropagation.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationPropagation.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/conversationPropagation.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.ConversationPropagation</name> - <family>org.jboss.seam.ui.ConversationPropagation</family> - <classname>org.jboss.seam.ui.component.html.HtmlConversationPropagation</classname> - <superclass>org.jboss.seam.ui.component.UIConversationPropagation</superclass> - <description> - <![CDATA[Customize the conversation propagation for a command link or button (or similar JSF control).]]> - </description> - <renderer generate="false"> - <name>org.jboss.seam.ui.ConversationPropagationRenderer</name> - <classname>org.jboss.seam.ui.renderkit.ConversationPropagationRendererBase</classname> - </renderer> - <tag generate="true"> - <name>conversationPropagation</name> - <classname>org.jboss.seam.ui.taglib.ConversationPropagationTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <taghandler> - <classname>org.jboss.seam.ui.handler.CommandButtonParameterComponentHandler</classname> - </taghandler> - &ui_parameter_attributes; -  - <property> - <name>pageflow</name> - <classname>java.lang.String</classname> - <description>a pageflow definition to begin. (This is only useful when propagation="begin" or propagation="join".)</description> - </property> -  - <property> - <name>type</name> - <classname>java.lang.String</classname> - <description>determines the conversation propagation style: begin, join, nested, none, end or endRoot.</description> - <defaultvalue>"none"</defaultvalue> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertDateTime.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertDateTime.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertDateTime.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <converter generate="false"> - <id>org.jboss.seam.ui.DateTimeConverter</id> - <classname>org.jboss.seam.ui.converter.DateTimeConverter</classname> - <description> - <![CDATA[Perform date or time conversions in the Seam timezone.]]> - </description> - <tag> - <name>convertDateTime</name> - <classname>org.jboss.seam.ui.taglib.ConvertDateTimeTag</classname> - <superclass> - javax.faces.webapp.ConverterELTag - </superclass> - </tag> - <property> - <name>timeStyle</name> - <classname>java.lang.String</classname> - <description>Predefined formatting style which determines how the time component of a date string is to be formatted and parsed. Applied only if type is "time" or "both". Valid values are "default", "short", "medium", "long", and "full". Default value is "default".</description> - </property> - <property> - <name>dateStyle</name> - <classname>java.lang.String</classname> - <description>Predefined formatting style which determines how the date component of a date string is to be formatted and parsed. Applied only if type is "date" or "both". Valid values are "default", "short", "medium", "long", and "full". Default value is "default".</description> - </property> - <property> - <name>pattern</name> - <classname>java.lang.String</classname> - <description>Custom formatting pattern which determines how the date/time string should be formatted and parsed.</description> - </property> - <property elonly="true"> - <name>locale</name> - <classname>java.util.Locale</classname> - <description>Locale whose predefined styles for dates and times are used during formatting or parsing. If not specified, the Locale returned by FacesContext.getViewRoot().getLocale() will be used. Value must be either a VB expression that evaluates to a java.util.Locale instance, or a String that is valid to pass as the first argument to the constructor java.util.Locale(String language, String country). The empty string is passed as the second argument.</description> - </property> - <property elonly="true"> - <name>timeZone</name> - <classname>java.util.TimeZone</classname> - <description>Time zone in which to interpret any time information in the date String. Value must be either a VB expression that evaluates to a java.util.TimeZone instance, or a String that is a timezone ID as described in the javadocs for java.util.TimeZone.getTimeZone().</description> - </property> - <property> - <name>type</name> - <classname>java.lang.String</classname> - <description>Specifies what contents the string value will be formatted to include, or parsed expecting. Valid values are "date", "time", and "both". Default value is "date".</description> - <defaultvalue>"date"</defaultvalue> - </property> - </converter> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEntity.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEntity.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEntity.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <converter generate="false" > - <id>org.jboss.seam.ui.EntityConverter</id> - <classname>org.jboss.seam.ui.EntityConverter</classname> - <description> - <![CDATA[Convert an entity.]]> - </description> - <tag> - <name>convertEntity</name> - <classname>org.jboss.seam.ui.taglib.ConvertEntityTag</classname> - <superclass> - javax.faces.webapp.ConverterELTag - </superclass> - </tag> - </converter> - -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEnum.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEnum.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/convertEnum.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <converter generate="false"> - <id>org.jboss.seam.ui.EnumConverter</id> - <classname>org.jboss.seam.ui.converter.EnumConverter</classname> - <description> - <![CDATA[Convert an enum.]]> - </description> - <tag> - <name>convertEnum</name> - <classname>org.jboss.seam.ui.taglib.ConvertEnumTag</classname> - <superclass> - javax.faces.webapp.ConverterELTag - </superclass> - </tag> - </converter> - -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/decorate.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/decorate.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/decorate.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Decorate</name> - <family>org.jboss.seam.ui.Decorate</family> - <classname>org.jboss.seam.ui.component.html.HtmlDecorate</classname> - <superclass>org.jboss.seam.ui.component.UIDecorate</superclass> - <description> - <![CDATA["Decorate" a JSF input field when validation fails or when required="true" is set.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.DecorateRenderer</name> - <classname>org.jboss.seam.ui.renderkit.DecorateRendererBase</classname> -  - - </renderer> - <tag> - <name>decorate</name> - <classname>org.jboss.seam.ui.taglib.DecorateTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - - <taghandler> - <classname>org.jboss.seam.ui.handler.DecorateHandler</classname> - </taghandler> - - &ui_component_attributes; - &html_style_attributes; - <property el="false"> - <name>for</name> - <classname>java.lang.String</classname> - <description>Id of the input field to decorate</description> - </property> - - <property existintag="false"> - <name>template</name> - <classname>java.lang.String</classname> - <description>XHTML template to use to decorate the input field</description> - </property> - - <property el="false"> - <name>enclose</name> - <classname>boolean</classname> - <description>if true, the template used to decorate the input field is - enclosed by the element specified with the "element" - attribute. By default this is a div element. - </description> - <defaultvalue>true</defaultvalue> - </property> - - <property el="false"> - <name>element</name> - <classname>java.lang.String</classname> - <description>the element to enclose the template used to decorate the input field. - By default, the template is enclosed with a div element.</description> - <defaultvalue>"div"</defaultvalue> - </property> - - </component> - -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/defaultAction.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/defaultAction.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/defaultAction.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.DefaultAction</name> - <family>org.jboss.seam.ui.DefaultAction</family> - <classname>org.jboss.seam.ui.component.html.HtmlDefaultAction</classname> - <superclass>javax.faces.component.UIOutput</superclass> - <description> - <![CDATA[Simulate pressing the action source when "enter" is pressed.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.DefaultActionRenderer</name> - <classname>org.jboss.seam.ui.renderkit.DefaultActionRendererBase</classname> - </renderer> - <tag> - <name>defaultAction</name> - <classname>org.jboss.seam.ui.taglib.DefaultActionTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/div.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/div.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/div.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Div</name> - <family>org.jboss.seam.ui.Div</family> - <classname>org.jboss.seam.ui.component.html.HtmlDiv</classname> - <superclass>org.jboss.seam.ui.component.UIStyle</superclass> - <description> - <![CDATA[Render a HTML <div>.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.DivRenderer</name> - <classname>org.jboss.seam.ui.renderkit.DivRendererBase</classname> - </renderer> - <tag> - <name>div</name> - <classname>org.jboss.seam.ui.taglib.DivTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <property> - <name>style</name> - <classname>java.lang.String</classname> - <description>CSS style(s) is/are to be applied when this component is rendered</description> - </property> - <property> - <name>styleClass</name> - <classname>java.lang.String</classname> - <description>Corresponds to the HTML class attribute</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/download.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/download.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/download.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Download</name> - <family>org.jboss.seam.ui.Download</family> - <classname>org.jboss.seam.ui.component.html.HtmlDownload</classname> - <superclass>org.jboss.seam.ui.component.UIDownload</superclass> - <description> - <![CDATA[Link for downloading a file]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.DownloadRenderer</name> - <classname>org.jboss.seam.ui.renderkit.DownloadRendererBase</classname> - </renderer> - <tag> - <name>download</name> - <classname>org.jboss.seam.ui.taglib.DownloadTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &html_style_attributes; - <property> - <name>src</name> - <classname>java.lang.String</classname> - <description>Source xhtml file that acts as resource holder</description> - </property> - <property> - <name>rendered</name> - <classname>boolean</classname> - <description>true iff this component should be rendered</description> - <defaultvalue>true</defaultvalue> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/enumItem.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/enumItem.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/enumItem.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.EnumItem</name> - <family>org.jboss.seam.ui.EnumItem</family> - <classname>org.jboss.seam.ui.component.html.HtmlEnumItem</classname> - <superclass>org.jboss.seam.ui.component.UIEnumItem</superclass> - <description> - <![CDATA[Creates a SelectItem from an enum value.]]> - </description> - <tag> - <name>enumItem</name> - <classname>org.jboss.seam.ui.taglib.EnumItemTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_select_item_attributes; - <property> - <name>enumValue</name> - <classname>java.lang.String</classname> - <description> - the string representation of the enum value. - </description> - </property> - <property> - <name>label</name> - <classname>java.lang.String</classname> - <description> - the label to be used when rendering the SelectItem. - </description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/equalityValidator.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/equalityValidator.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/equalityValidator.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - - <component> - <name>org.jboss.seam.ui.EqualityValidator</name> - <family>org.jboss.seam.ui.EqualityValidator</family> - <classname>org.jboss.seam.ui.component.html.HtmlEqualityValidator</classname> - <superclass>org.jboss.seam.ui.component.UIEqualityValidator</superclass> - <description> - <![CDATA[Validate all child JSF input fields against the bound propertys using Hibernate Validator.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.EqualityValidatorRenderer</name> - <classname>org.jboss.seam.ui.renderkit.EqualityValidatorRendererBase</classname> - </renderer> - <tag> - <name>validateEquality</name> - <classname>org.jboss.seam.ui.taglib.EqualityValidatorTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <property> - <name>for</name> - <classname>java.lang.String</classname> - <description>Id of component to validate against</description> - </property> - <property> - <name>message</name> - <classname>java.lang.String</classname> - <description>Error message to show</description> - </property> - <property> - <name>messageId</name> - <classname>java.lang.String</classname> - <description>Message id to use on failure</description> - </property> - <property> - <name>operator</name> - <classname>java.lang.String</classname> - <description>Operation to use.</description> - </property> - <property> - <name>required</name> - <classname>boolean</classname> - <description>True if a value is required for the filed to validate (default:true)</description> - <defaultvalue>true</defaultvalue> - </property> - - </component> - -</components> - Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fileUpload.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fileUpload.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fileUpload.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.FileUpload</name> - <family>org.jboss.seam.ui.FileUpload</family> - <classname>org.jboss.seam.ui.component.html.HtmlFileUpload</classname> - <superclass>org.jboss.seam.ui.component.UIFileUpload</superclass> - <description> - <![CDATA[Renders a file upload control. This control must be used within a form with an encoding type of multipart/form-data, i.e: - -<h:form enctype="multipart/form-data"> - -For multipart requests, the Seam Multipart servlet filter must also be configured in web.xml: - -<filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> -</filter> - -<filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> -</filter-mapping> - -The following configuration options for multipart requests may be configured in components.xml: - -* createTempFiles - if this option is set to true, uploaded files are streamed to a temporary file instead of in memory. -* maxRequestSize - the maximum size of a file upload request, in bytes. - -Here's an example: - -<component class="org.jboss.seam.servlet.MultipartConfig"> - <property name="createTempFiles">true</property> - <property name="maxRequestSize">1000000</property> -</component>]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.FileUploadRenderer</name> - <classname>org.jboss.seam.ui.renderkit.FileUploadRendererBase</classname> -  - </renderer> - <tag> - <name>fileUpload</name> - <classname>org.jboss.seam.ui.taglib.FileUploadTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_input_attributes; - &html_style_attributes; - &html_input_attributes; - &html_events; - &html_input_events; - <property transient="true"> - <name>accept</name> - <classname>java.lang.String</classname> - <description>a comma-separated list of content types to accept, may not be supported by the browser. E.g. "images/png,images/jpg", "images/*".</description> - </property> - <property elonly="true"> - <name>data</name> - <classname>java.lang.Object</classname> - <description>this value binding receives the file's content type (optional).</description> - </property> - <property elonly="true"> - <name>contentType</name> - <classname>java.lang.String</classname> - <description>the property to receive the contentType</description> - </property> - <property elonly="true"> - <name>fileName</name> - <classname>java.lang.String</classname> - <description>this value binding receives the filename (optional).</description> - </property> - <property elonly="true"> - <name>fileSize</name> - <classname>java.lang.Integer</classname> - <description>this value binding receives the file size (optional).</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedText.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedText.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedText.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components > - <component> - <name>org.jboss.seam.ui.FormattedText</name> - <family>org.jboss.seam.ui.FormattedText</family> - <classname>org.jboss.seam.ui.component.html.HtmlFormattedText</classname> - <superclass>org.jboss.seam.ui.component.UIFormattedText</superclass> - <description> - <![CDATA[Output Seam Text. Parse errors generate WARN level log messages.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.FormattedTextRenderer</name> - <classname>org.jboss.seam.ui.renderkit.FormattedTextRendererBase</classname> -  - </renderer> - <tag> - <name>formattedText</name> - <classname>org.jboss.seam.ui.taglib.FormattedTextTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_output_attributes; - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedTextValidator.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedTextValidator.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/formattedTextValidator.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <validator generate="false"> - <id>org.jboss.seam.ui.FormattedTextValidator</id> - <classname>org.jboss.seam.ui.validator.FormattedTextValidator</classname> - <description> - <![CDATA[Validate Seam Text input]]> - </description> - <tag> - <name>validateFormattedText</name> - <classname>org.jboss.seam.ui.taglib.FormattedTextValidatorTag</classname> - <superclass>javax.faces.webapp.ValidatorELTag</superclass> - </tag> - </validator> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fragment.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fragment.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/fragment.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Fragment</name> - <family>org.jboss.seam.ui.Fragment</family> - <classname>org.jboss.seam.ui.component.html.HtmlFragment</classname> - <superclass>org.jboss.seam.ui.component.UIFragment</superclass> - <description> - <![CDATA[Surround a page fragment, allows you to apply render/not render without any html output]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.FragmentRenderer</name> - <classname>org.jboss.seam.ui.renderkit.FragmentRendererBase</classname> - </renderer> - <tag> - <name>fragment</name> - <classname>org.jboss.seam.ui.taglib.FragmentTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_component_attributes; - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/graphicImage.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/graphicImage.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/graphicImage.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.graphicImage.GraphicImage</name> - <family>org.jboss.seam.ui.graphicImage.GraphicImage</family> - <classname>org.jboss.seam.ui.component.html.HtmlGraphicImage</classname> - <superclass>org.jboss.seam.ui.graphicImage.UIGraphicImage</superclass> - <description> - <![CDATA[Output an image to the view. You can specify the file as a path, a java.io.File, java.io.InputStream, java.net.URL or byte[]]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.GraphicImageRenderer</name> - <classname>org.jboss.seam.ui.graphicImage.GraphicImageRendererBase</classname> -  - </renderer> - <tag> - <name>graphicImage</name> - <classname>org.jboss.seam.ui.taglib.GraphicImageTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &html_style_attributes; - &ui_graphic_attributes; - &ui_output_attributes; - <property> - <name>fileName</name> - <classname>java.lang.String</classname> - <description>File name for the generated URL - allows a stable file name and thus browser caching</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/label.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/label.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/label.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Label</name> - <family>javax.faces.Output</family> - <classname>org.jboss.seam.ui.component.html.HtmlLabel</classname> - <superclass>org.jboss.seam.ui.component.UILabel</superclass> - <description> - <![CDATA[A label associated with the nearest JSF input component]]> - </description> - <tag> - <name>label</name> - <classname>org.jboss.seam.ui.taglib.LabelTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &html_label_attributes; - &ui_output_attributes; - &html_style_attributes; - <property> - <name>for</name> - <classname>java.lang.String</classname> - <description>Id of input component this label is for</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/link.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/link.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/link.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Link</name> - <family>org.jboss.seam.ui.Link</family> - <classname>org.jboss.seam.ui.component.html.HtmlLink</classname> - <superclass>org.jboss.seam.ui.component.UILink</superclass> - <description> - <![CDATA[A link that supports invocation of an action with control over conversation propagation. Does not submit the form.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.LinkRenderer</name> - <classname>org.jboss.seam.ui.renderkit.LinkRendererBase</classname> -  - </renderer> - <tag> - <name>link</name> - <classname>org.jboss.seam.ui.taglib.LinkTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_output_attributes; - &html_anchor_attributes; - &html_universal_attributes; - &html_events; - &ui_command_attributes; - <property> - <name>view</name> - <classname>java.lang.String</classname> - <description>the JSF view id to link to.</description> - </property> - <property> - <name>pageflow</name> - <classname>java.lang.String</classname> - <description>a pageflow definition to begin. (This is only useful when propagation="begin" or propagation="join".)</description> - </property> -  - <property> - <name>propagation</name> - <classname>java.lang.String</classname> - <description>determines the conversation propagation style: begin, join, nest, none, end or endRoot.</description> - <defaultvalue>"default"</defaultvalue> - </property> -  - <property> - <name>fragment</name> - <classname>java.lang.String</classname> - <description>the fragment identifier to link to.</description> - </property> -  - <property> - <name>outcome</name> - <classname>java.lang.String</classname> - <description>The outcome to use when evaluating navigation rules</description> - </property> - <property> - <name>disabled</name> - <classname>boolean</classname> - <description>If true, write the link as disabled in HTML</description> - </property> - <property elonly="true" transient="true" > - <name>taskInstance</name> - <classname>java.lang.Object</classname> - <description>Specify the task to operate on (e.g. for @StartTask)</description> - </property> - <property> - <name>conversationName</name> - <classname>java.lang.String</classname> - <description>The name of the conversation for natural conversations</description> - </property> - <property> - <name>includePageParams</name> - <classname>boolean</classname> - <description>Include page parameters defined in pages.xml when rendering the button</description> - <defaultvalue>true</defaultvalue> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/message.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/message.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/message.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Message</name> - <family>javax.faces.Message</family> - <classname>org.jboss.seam.ui.component.html.HtmlMessage</classname> - <superclass>org.jboss.seam.ui.component.UIMessage</superclass> - <description> - <![CDATA["Decorate" a JSF input field with the validation error message.]]> - </description> - <tag> - <name>message</name> - <classname>org.jboss.seam.ui.taglib.MessageTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_message_attributes; - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/modelValidator.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/modelValidator.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/modelValidator.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <validator generate="false"> - <id>org.jboss.seam.ui.ModelValidator</id> - <classname>org.jboss.seam.ui.validator.ModelValidator</classname> - <description> - <![CDATA[Validate the JSF component against the model]]> - </description> - <tag> - <name>validate</name> - <classname>org.jboss.seam.ui.taglib.ModelValidatorTag</classname> - <superclass>javax.faces.webapp.ValidatorELTag</superclass> - </tag> - </validator> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/remote.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/remote.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/remote.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Remote</name> - <family>org.jboss.seam.ui.Remote</family> - <classname>org.jboss.seam.ui.component.html.HtmlRemote</classname> - <superclass>org.jboss.seam.ui.component.UIRemote</superclass> - <description> - <![CDATA[Write out script element for use with Seam Remoting]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.RemoteRenderer</name> - <classname>org.jboss.seam.ui.renderkit.RemoteRendererBase</classname> - </renderer> - <tag> - <name>remote</name> - <classname>org.jboss.seam.ui.taglib.RemoteTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_component_attributes; - &html_style_attributes; - <property> - <name>include</name> - <classname>java.lang.String</classname> - <description>The Seam components to include in the Seam Remoting JS interface stubs</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/resource.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/resource.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/resource.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Resource</name> - <family>org.jboss.seam.ui.Resource</family> - <classname>org.jboss.seam.ui.component.html.HtmlResource</classname> - <superclass>org.jboss.seam.ui.component.UIResource</superclass> - <description> - <![CDATA[Given a data in form of an inputstream, java.util.File or byte[] and a content-type, this tag sends the data to the browser]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.ResourceRenderer</name> - <classname>org.jboss.seam.ui.renderkit.ResourceRendererBase</classname> - </renderer> - <tag> - <name>resource</name> - <classname>org.jboss.seam.ui.taglib.ResourceTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <property> - <name>data</name> - <classname>java.lang.Object</classname> - <description>Inputstream, File or byte[].</description> - </property> - <property> - <name>contentType</name> - <classname>java.lang.String</classname> - <description>Content-type of given data</description> - </property> - <property> - <name>fileName</name> - <classname>java.lang.String</classname> - <description>file name to send to browser (default: name of view)</description> - </property> - <property> - <name>disposition</name> - <classname>java.lang.String</classname> - <description>Content-Disposition for file (default: inline)</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selectItems.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selectItems.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selectItems.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.SelectItems</name> - <family>javax.faces.SelectItems</family> - <classname>org.jboss.seam.ui.component.html.HtmlSelectItems</classname> - <superclass>org.jboss.seam.ui.component.UISelectItems</superclass> - <description> - <![CDATA[Creates a List<SelectItem> from a List, Set, DataModel or Array.]]> - </description> - <tag> - <name>selectItems</name> - <classname>org.jboss.seam.ui.taglib.SelectItemsTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_select_items_attributes; - <property required="true"> - <name>value</name> - <classname>java.lang.Object</classname> - <defaultvalue>an EL expression specifying the data that backs the List<SelectItem></defaultvalue> - </property> - <property required="true" el="false"> - <name>var</name> - <classname>java.lang.String</classname> - <description>defines the name of the local variable that holds the current object during iteration</description> - </property> - <property> - <name>itemValue</name> - <classname>java.lang.Object</classname> - <description>Value to return to the server if this option is selected. Optional, by default the var object is used. Can reference the var variable</description> - </property> - <property exist="true"> - <name>label</name> - <classname>java.lang.String</classname> - <description>the label to be used when rendering the SelectItem. Can reference the var variable</description> - <alias>itemLabel</alias> - </property> - <property> - <name>disabled</name> - <classname>java.lang.Boolean</classname> - <description>if true the SelectItem will be rendered disabled. Can reference the var variable</description> - <alias>itemDisabled</alias> - </property> - <property> - <name>noSelectionLabel</name> - <classname>java.lang.String</classname> - <description>specifies the (optional) label to place at the top of list (if required="true" is also specified then selecting this value will cause a validation error)</description> - </property> - <property> - <name>hideNoSelectionLabel</name> - <classname>java.lang.Boolean</classname> - <description>if true, the noSelectionLabel will be hidden when a value is selected</description> - <defaultvalue>false</defaultvalue> - </property> - <property> - <name>escape</name> - <classname>java.lang.Boolean</classname> - <description>if false, characters in the label will not be escaped. Beware that this is a safety issue when the label is in any way derived from input supplied by the application's user. . Can reference the var variable</description> - <defaultvalue>true</defaultvalue> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selection.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selection.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/selection.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Selection</name> - <family>org.jboss.seam.ui.Selection</family> - <classname>org.jboss.seam.ui.component.html.HtmlSelection</classname> - <superclass>org.jboss.seam.ui.component.UISelection</superclass> - <description> - <![CDATA[]]> - </description> - <tag> - <name>selection</name> - <classname>org.jboss.seam.ui.taglib.SelectionTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_component_attributes; - <property> - <name>dataModel</name> - <classname>java.lang.String</classname> - </property> - <property> - <name>var</name> - <classname>java.lang.String</classname> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/span.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/span.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/span.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Span</name> - <family>org.jboss.seam.ui.Span</family> - <classname>org.jboss.seam.ui.component.html.HtmlSpan</classname> - <superclass>org.jboss.seam.ui.component.UISpan</superclass> - <description> - <![CDATA[Render a HTML <span>]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.SpanRenderer</name> - <classname>org.jboss.seam.ui.renderkit.SpanRendererBase</classname> - </renderer> - <tag> - <name>span</name> - <classname>org.jboss.seam.ui.taglib.SpanTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_component_attributes; - &html_style_attributes; - <property> - <name>title</name> - <classname>java.lang.String</classname> - <description>Span title attribute</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/taskId.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/taskId.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/taskId.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.TaskId</name> - <family>org.jboss.seam.ui.TaskId</family> - <classname>org.jboss.seam.ui.component.html.HtmlTaskId</classname> - <superclass>org.jboss.seam.ui.component.UITaskId</superclass> - <description> - <![CDATA[Add the task id to an output link (or similar JSF control), when the task is available via #{task}.]]> - </description> - <tag> - <name>taskId</name> - <classname>org.jboss.seam.ui.taglib.TaskIdTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_parameter_attributes; - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/token.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/token.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/token.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.Token</name> - <family>org.jboss.seam.ui.Token</family> - <classname>org.jboss.seam.ui.component.html.HtmlToken</classname> - <superclass>org.jboss.seam.ui.component.UIToken</superclass> - <description> - <![CDATA[Render a secure token in the parent form that is validated on postback to guard against CSRF attacks.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.TokenRenderer</name> - <classname>org.jboss.seam.ui.renderkit.TokenRendererBase</classname> - </renderer> - <tag> - <name>token</name> - <classname>org.jboss.seam.ui.taglib.TokenTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - &ui_component_attributes; - <property> - <name>requireSession</name> - <classname>boolean</classname> - <description>A flag indicating whether the session id should be tied into the secure token.</description> - <defaultvalue>false</defaultvalue> - </property> - <property> - <name>enableCookieNotice</name> - <classname>boolean</classname> - <description>A flag indicating whether a notice should be presented to the user if cookies are disabled.</description> - <defaultvalue>false</defaultvalue> - </property> - <property> - <name>allowMultiplePosts</name> - <classname>boolean</classname> - <description>A flag indicating whether the form can be submitted multiple times with the same signature (i.e., token).</description> - <defaultvalue>false</defaultvalue> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageBlur.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageBlur.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageBlur.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.graphicImage.TransformImageBlur</name> - <family>org.jboss.seam.ui.graphicImage.TransformImageBlur</family> - <classname>org.jboss.seam.ui.component.html.HtmlTransformImageBlur</classname> - <superclass>org.jboss.seam.ui.graphicImage.UITransformImageBlur</superclass> - <description> - <![CDATA[Nested in a s:graphicImage. Transform an image by applying a blur]]> - </description> - <tag> - <name>transformImageBlur</name> - <classname>org.jboss.seam.ui.taglib.TransformImageBlurTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <property> - <name>radius</name> - <classname>java.lang.String</classname> - <description>The radius of the blur (essentially the ammount of blur)</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageSize.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageSize.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageSize.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.graphicImage.TransformImageSize</name> - <family>org.jboss.seam.ui.graphicImage.TransformImageSize</family> - <classname>org.jboss.seam.ui.component.html.HtmlTransformImageSize</classname> - <superclass>org.jboss.seam.ui.graphicImage.UITransformImageSize</superclass> - <description> - <![CDATA[Nested in a s:graphicImage. Transform an image by altering the size]]> - </description> - <tag> - <name>transformImageSize</name> - <classname>org.jboss.seam.ui.taglib.TransformImageSizeTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <property> - <name>maintainRatio</name> - <classname>boolean</classname> - <description>If true, don't alter the ratio of the image. In this case only height or width should be specificed.</description> - </property> - <property> - <name>width</name> - <classname>java.lang.Integer</classname> - <description>The new width of the image</description> - </property> - <property> - <name>height</name> - <classname>java.lang.Integer</classname> - <description>The new height of the image</description> - </property> - <property> - <name>factor</name> - <classname>java.lang.Double</classname> - <description>Change the size of the image by a fraction. If factor is specified, height, width and maintainRatio should not be specified</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageType.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageType.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/transformImageType.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.graphicImage.TransformImageType</name> - <family>org.jboss.seam.ui.graphicImage.TransformImageType</family> - <classname>org.jboss.seam.ui.component.html.HtmlTransformImageType</classname> - <superclass>org.jboss.seam.ui.graphicImage.UITransformImageType</superclass> - <description> - <![CDATA[Nested in a s:graphicImage. Transform an image by changing it's type]]> - </description> - <tag> - <name>transformImageType</name> - <classname>org.jboss.seam.ui.taglib.TransformImageTypeTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - <property> - <name>contentType</name> - <classname>java.lang.String</classname> - <description>The mime type of the output image</description> - </property> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/validateAll.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/validateAll.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/config/component/validateAll.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "http://jboss.org/jbossrichfaces/component-config.dtd" > -<components> - <component> - <name>org.jboss.seam.ui.ValidateAll</name> - <family>org.jboss.seam.ui.ValidateAll</family> - <classname>org.jboss.seam.ui.component.html.HtmlValidateAll</classname> - <superclass>org.jboss.seam.ui.component.UIValidateAll</superclass> - <description> - <![CDATA[Validate all child JSF input fields against the bound propertys using Hibernate Validator.]]> - </description> - <renderer generate="false" override="false"> - <name>org.jboss.seam.ui.ValidateAllRenderer</name> - <classname>org.jboss.seam.ui.renderkit.ValidateAllRendererBase</classname> - </renderer> - <tag> - <name>validateAll</name> - <classname>org.jboss.seam.ui.taglib.ValidateAllTag</classname> - <superclass> - org.jboss.seam.ui.util.cdk.UIComponentTagBase - </superclass> - </tag> - </component> -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/AbstractEntityLoader.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/AbstractEntityLoader.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/AbstractEntityLoader.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,58 +0,0 @@ -package org.jboss.seam.ui; - -import static org.jboss.seam.ScopeType.STATELESS; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.framework.Identifier; -import org.jboss.seam.framework.PersistenceController; - -/** - * Helper class to load entities for the entity converter - * @author Pete Muir - * - */ - -public abstract class AbstractEntityLoader<T> extends PersistenceController<T> -{ - - /** - * Load and return the entity stored - * @param key - * @return The entity or null if no entity is available at that key - */ - @Transactional - public Object get(String key) - { - Identifier identifier = EntityIdentifierStore.instance().get(key); - if (identifier != null) - { - return identifier.find(getPersistenceContext()); - } - else - { - return null; - } - } - - /** - * Store an entity id/clazz - * @param entity The entity to store - * @return The key under which the clazz/id are stored - */ - @Transactional - public String put(Object entity) - { - return EntityIdentifierStore.instance().put(createIdentifier(entity), entity); - } - - protected abstract Identifier createIdentifier(Object entity); - - public abstract void validate(); - - public static AbstractEntityLoader instance() - { - return (AbstractEntityLoader) Component.getInstance("org.jboss.seam.ui.entityLoader", STATELESS); - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/ClientUidSelector.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/ClientUidSelector.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/ClientUidSelector.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,61 +0,0 @@ -package org.jboss.seam.ui; - -import javax.faces.context.FacesContext; - -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.faces.Selector; -import org.jboss.seam.util.RandomStringUtils; - -/** - * <p>A selector which manages the cookie that gives the browser a - * unique identifier. This value is shared only between the browser - * and the server, thus allowing the server to determine if two - * distinct requests were made by the same source.</p> - * - * <p>The identifier is stored in a cookie named <code>javax.faces.ClientToken</code>.</p> - * - * @author Dan Allen - */ -@Name("org.jboss.seam.ui.clientUidSelector") -public class ClientUidSelector extends Selector -{ - - private static final long serialVersionUID = 816459544346114991L; - - private String clientUid; - - @Create - public void onCreate() - { - setCookiePath(FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath()); - setCookieMaxAge(-1); - setCookieEnabled(true); - clientUid = getCookieValue(); - } - - public void seed() - { - if (!isSet()) { - clientUid = RandomStringUtils.random(50, true, true); - setCookieValueIfEnabled(clientUid); - } - } - - public boolean isSet() - { - return clientUid != null; - } - - public String getClientUid() - { - return clientUid; - } - - @Override - protected String getCookieName() - { - return "javax.faces.ClientToken"; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/DocumentStoreUtils.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,105 +0,0 @@ -package org.jboss.seam.ui; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.ByteBuffer; -import java.nio.channels.Channels; -import java.nio.channels.ReadableByteChannel; -import java.nio.channels.WritableByteChannel; - -import javax.faces.context.FacesContext; - -import org.jboss.seam.core.Manager; -import org.jboss.seam.document.DocumentData; -import org.jboss.seam.document.DocumentStore; -import org.jboss.seam.document.DocumentData.DocumentType; -import org.jboss.seam.navigation.Pages; -import org.jboss.seam.ui.component.UIResource; - -public class DocumentStoreUtils -{ - private static final int BUFFER_SIZE = 32768; - - public static String addResourceToDataStore(FacesContext ctx, UIResource resource) { - String baseName = Pages.getCurrentBaseName(); - String viewId = Pages.getViewId(ctx); - - DocumentStore store = DocumentStore.instance(); - String id = store.newId(); - - DocumentType type = new DocumentType("", resource.getContentType()); - - DocumentData documentData = new DownloadableDocumentData(baseName, type, resource.getData()); - documentData.setFilename(resource.getFileName()); - documentData.setDisposition(resource.getDisposition()); - - String url = store.preferredUrlForContent(resource.getFileName(), type.getExtension(), id); - url = Manager.instance().encodeConversationId(url, viewId); - store.saveData(id, documentData); - return url; - } - - static class DownloadableDocumentData - extends DocumentData - { - private Object data; - - public DownloadableDocumentData(String baseName, DocumentType type, Object data) { - super(baseName, type); - this.data = data; - } - - @Override - public void writeDataToStream(OutputStream os) - throws IOException - { - if (data instanceof byte[]) { - os.write((byte[]) data); - } else if (data instanceof File) { - writeStream(os, new FileInputStream((File) data)); - } else if (data instanceof InputStream) { - writeStream(os, (InputStream) data); - } - } - - private void writeStream(OutputStream os, InputStream is) - throws IOException - - { - ReadableByteChannel in = Channels.newChannel(is); - WritableByteChannel out = Channels.newChannel(os); - - try { - copyChannel(in, out); - } finally { - try { - in.close(); - } catch (IOException e) { - // eat it - } - - try { - out.close(); - } catch (IOException e) { - // eat it - } - } - } - - private void copyChannel(ReadableByteChannel in, WritableByteChannel out) - throws IOException - { - ByteBuffer buffer = ByteBuffer.allocateDirect(BUFFER_SIZE); - - while (in.read(buffer) != -1 || buffer.position() > 0) { - buffer.flip(); - out.write(buffer); - buffer.compact(); - } - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,79 +0,0 @@ -package org.jboss.seam.ui; - -import static org.jboss.seam.ScopeType.CONVERSATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.io.Serializable; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.ConverterException; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.annotations.faces.Converter; - -/** - * Allows conversion of an entity to/from a key which can be written to a page. - * - * Support is provided for JPA (by default) and Hibernate (with the session - * specified in components.xml) - */ -@Name("org.jboss.seam.ui.EntityConverter") -@Scope(CONVERSATION) -@Install(precedence = BUILT_IN) -@Converter -@BypassInterceptors -public class EntityConverter implements - javax.faces.convert.Converter, Serializable -{ - - private AbstractEntityLoader entityLoader; - - public AbstractEntityLoader getEntityLoader() - { - if (entityLoader == null) - { - return AbstractEntityLoader.instance(); - } - else - { - return entityLoader; - } - } - - public void setEntityLoader(AbstractEntityLoader entityLoader) - { - this.entityLoader = entityLoader; - } - - @SuppressWarnings("unchecked") - @Transactional - public String getAsString(FacesContext facesContext, UIComponent cmp, Object value) throws ConverterException - { - if (value == null) - { - return null; - } - if (value instanceof String) - { - return (String) value; - } - return getEntityLoader().put(value); - } - - - @Transactional - public Object getAsObject(FacesContext facesContext, UIComponent cmp, String value) throws ConverterException - { - if (value == null || value.length() == 0) - { - return null; - } - return getEntityLoader().get(value); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityIdentifierStore.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityIdentifierStore.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/EntityIdentifierStore.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,72 +0,0 @@ -package org.jboss.seam.ui; - -import static org.jboss.seam.ScopeType.PAGE; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.AbstractMutable; -import org.jboss.seam.framework.Identifier; - -/** - * Page scoped store for entity identifiers used by the EntityConverter. - * - * By default a list is used and the key returned is the list index. The key - * used can be customised by overriding this component and implementing the - * get and put methods - * - * @author Pete Muir - * - */ -@Name("org.jboss.seam.ui.entityIdentifierStore") -@Install(precedence=BUILT_IN) -@Scope(PAGE) -public class EntityIdentifierStore extends AbstractMutable -{ - - private List<Identifier> store; - - @Create - public void create() - { - store = new ArrayList<Identifier>(); - } - - public Identifier get(String key) - { - try - { - return store.get(new Integer(key)); - } - catch (IndexOutOfBoundsException e) - { - return null; - } - } - - public String put(Identifier identifier, Object entity) - { - if (!store.contains(identifier)) - { - store.add(identifier); - setDirty(); - } - return ((Integer) store.indexOf(identifier)).toString(); - } - - public static EntityIdentifierStore instance() - { - if (!Contexts.isPageContextActive()) - { - throw new IllegalArgumentException("Page scope not active"); - } - return (EntityIdentifierStore) Component.getInstance(EntityIdentifierStore.class, PAGE); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/HibernateEntityLoader.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/HibernateEntityLoader.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/HibernateEntityLoader.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,57 +0,0 @@ -package org.jboss.seam.ui; - -import static org.jboss.seam.ScopeType.STATELESS; -import static org.jboss.seam.annotations.Install.FRAMEWORK; - -import org.hibernate.Session; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.framework.HibernateEntityIdentifier; -import org.jboss.seam.framework.Identifier; - -/** - * Stores entity identifiers under a key, which can be used on a page - * - * @author Pete Muir - */ - -@Name("org.jboss.seam.ui.entityLoader") -@Install(precedence=FRAMEWORK, classDependencies="org.hibernate.Session", value=false) -@Scope(STATELESS) -public class HibernateEntityLoader extends AbstractEntityLoader<Session> -{ - - @Override - protected Identifier createIdentifier(Object entity) - { - return new HibernateEntityIdentifier(entity, getPersistenceContext()); - } - - @Override - protected String getPersistenceContextName() - { - return "hibernateSession"; - } - - @Override - public void validate() - { - if (getPersistenceContext() == null) - { - throw new IllegalStateException("Unable to access a Seam Managed Hibernate Session. You must either have a Seam Managed Hibernate Session called hibernateSession or configure one in components.xml"); - } - - } - - public Session getSession() - { - return getPersistenceContext(); - } - - public void setSession(Session session) - { - setPersistenceContext(session); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/JpaEntityLoader.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/JpaEntityLoader.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/JpaEntityLoader.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,58 +0,0 @@ -package org.jboss.seam.ui; - -import static org.jboss.seam.ScopeType.STATELESS; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import javax.persistence.EntityManager; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.framework.EntityIdentifier; -import org.jboss.seam.framework.Identifier; - -/** - * Stores entity identifiers under a key, which can be used on a page - * - * @author Pete Muir - */ - -@Name("org.jboss.seam.ui.entityLoader") -@Install(precedence=BUILT_IN, value=true, classDependencies="javax.persistence.EntityManager") -@Scope(STATELESS) -public class JpaEntityLoader extends AbstractEntityLoader<EntityManager> -{ - - @Override - protected Identifier createIdentifier(Object entity) - { - return new EntityIdentifier(entity, getPersistenceContext()); - } - - @Override - protected String getPersistenceContextName() - { - return "entityManager"; - } - - @Override - public void validate() - { - if (getPersistenceContext() == null) - { - throw new IllegalStateException("Unable to access a persistence context. You must either have a SMPC called entityManager or configure one in components.xml"); - } - - } - - public EntityManager getEntityManager() - { - return getPersistenceContext(); - } - - public void setEntityManager(EntityManager entityManager) - { - setPersistenceContext(entityManager); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/RenderStampStore.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/RenderStampStore.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/RenderStampStore.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,96 +0,0 @@ -package org.jboss.seam.ui; - -import static org.jboss.seam.ScopeType.SESSION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; - -/** - * A class that stores render stamps for use with <s:token> when client side - * state saving is in use. By default the render stamp store will never remove a - * render stamp unless instructed to by a UIToken. If the maxSize property is - * larger than zero then it will control the maximum number of tokens stored, - * with the oldest token being removed when a token is inserted that will take - * the store over the maxSize limit. The default maxSize is 100. - * - * @author Stuart Douglas - */ -@Name("org.jboss.seam.ui.renderStampStore") -@Scope(SESSION) -@Install(precedence = BUILT_IN, value = false) -@AutoCreate -@BypassInterceptors -public class RenderStampStore implements Serializable { - - class RenderStamp { - String stamp; - Date timeStamp; - } - - int maxSize = 100; - - Map<String, RenderStamp> store = new ConcurrentHashMap<String, RenderStamp>(); - - /** - * Stores a stamp in the store, and returns the key it is stored under. - */ - public String storeStamp(String stamp) { - if (maxSize > 0) { - if (store.size() == maxSize) { - Date oldest = null; - String oldestSigniture = null; - for (String sig : store.keySet()) { - RenderStamp s = store.get(sig); - if (oldest == null || s.timeStamp.before(oldest)) { - oldestSigniture = sig; - } - } - store.remove(oldestSigniture); - } - } - RenderStamp s = new RenderStamp(); - s.stamp = stamp; - s.timeStamp = new Date(); - String key; - do { - key = UUID.randomUUID().toString(); - } while (!store.containsKey(key)); - store.put(key, s); - return key; - } - - public void removeStamp(String viewSigniture) { - store.remove(viewSigniture); - } - - public String getStamp(String viewSigniture) { - RenderStamp s = store.get(viewSigniture); - if (s != null) { - return store.get(viewSigniture).stamp; - } - return null; - } - - public static RenderStampStore instance() { - return (RenderStampStore) Component.getInstance(RenderStampStore.class); - } - - public int getMaxSize() { - return maxSize; - } - - public void setMaxSize(int maxSize) { - this.maxSize = maxSize; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/UnauthorizedCommandException.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/UnauthorizedCommandException.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/UnauthorizedCommandException.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,50 +0,0 @@ -package org.jboss.seam.ui; - -import javax.faces.FacesException; - -/** - * An exception is thrown when the authenticity of a JSF command (i.e., form post) - * that relies on a UIToken cannot be verified. - * - * @author Dan Allen - */ -public class UnauthorizedCommandException extends FacesException -{ - private String viewId; - - /** - * <p>Construct a new exception with no detail message or root cause.</p> - */ - public UnauthorizedCommandException() { - super(); - } - - /** - * <p>Construct a new exception with a detail message and the view ID</p> - */ - public UnauthorizedCommandException(String viewId, String message) { - super(message); - this.viewId = viewId; - } - - /** - * <p>Returns the view ID to which the authorized command was directed.</p> - */ - public String getViewId() - { - return viewId; - } - - /** - * <p>Returns the detail message explaining the reason for the denial. - * Includes the view ID if specified.</p> - */ - @Override - public String getMessage() - { - if (viewId != null) { - return "viewId: " + viewId + " - " + super.getMessage(); - } - return super.getMessage(); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIAction.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIAction.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIAction.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,99 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; - -import org.jboss.seam.navigation.Pages; -import org.jboss.seam.navigation.SafeActions; - -/* - * This is a support component and is not processed by the CDK (doesn't appear in faces-config) - * - */ -public class UIAction extends UIParameter -{ - - private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Action"; - - @Override - public String getFamily() - { - return COMPONENT_FAMILY; - } - - private String action; - - public String getAction() - { - return action; - } - - public void setAction(String action) - { - this.action = action; - } - - private boolean isMethodBinding() - { - return getAction().startsWith("#{"); - } - - @Override - public String getName() - { - return isMethodBinding() ? "actionMethod" : "actionOutcome"; - } - - @Override - public Object getValue() - { - String viewId = Pages.getCurrentViewId(); - if ( isMethodBinding() ) - { - String actionId = SafeActions.toActionId( viewId, getAction() ); - SafeActions.instance().addSafeAction(actionId); - return actionId; - } - else - { - return getAction(); - } - } - - @Override - public void restoreState(FacesContext context, Object state) { - Object[] values = (Object[]) state; - super.restoreState(context, values[0]); - action = (String) values[1]; - } - - @Override - public Object saveState(FacesContext context) { - Object[] values = new Object[2]; - values[0] = super.saveState(context); - values[1] = action; - return values; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIButton.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIButton.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIButton.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,52 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - - -/** - * JSF component class - * - */ -public abstract class UIButton extends UISeamCommandBase { - - public abstract String getStyleClass(); - - public abstract void setStyleClass(String styleClass); - - public abstract String getStyle(); - - public abstract void setStyle(String style); - - public abstract boolean isDisabled(); - - public abstract void setDisabled(boolean disabled); - - public abstract String getOnclick(); - - public abstract void setOnclick(String onclick); - - public abstract String getImage(); - - public abstract void setImage(String image); - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UICache.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UICache.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,52 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License version 2.1 as published - * by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.faces.component.UIComponentBase; - -import org.jboss.seam.cache.CacheProvider; - - -/** - * JSF component class - * - */ -public abstract class UICache extends UIComponentBase -{ - - public abstract boolean isEnabled(); - - public abstract void setEnabled(boolean enabled); - - public abstract String getKey(); - - public abstract void setKey(String key); - - public abstract String getRegion(); - - public abstract void setRegion(String region); - - public abstract CacheProvider getCacheProvider(); - - public abstract void setCacheProvider(CacheProvider cacheProvider); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationId.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationId.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationId.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,86 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; - -import org.jboss.seam.core.Conversation; -import org.jboss.seam.core.Manager; -import org.jboss.seam.navigation.Page; -import org.jboss.seam.navigation.Pages; - - -/** - * JSF component class - * - */ -public abstract class UIConversationId extends UIParameter { - - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationId"; - - @Override - public String getName() - { - Conversation conversation = Conversation.instance(); - if (getViewId()!=null && ( !conversation.isNested() || conversation.isLongRunning() ) ) - { - return Pages.instance().getPage(getViewId()) - .getConversationIdParameter() - .getParameterName(); - } - else - { - return Manager.instance().getConversationIdParameter(); - } - } - - @Override - public Object getValue() - { - Conversation conversation = Conversation.instance(); - if ( !conversation.isNested() || conversation.isLongRunning() ) - { - if (getViewId()!=null) - { - Page page = Pages.instance().getPage(getViewId()); - return page.getConversationIdParameter().getParameterValue(); - } - else - { - return conversation.getId(); - } - } - else - { - return conversation.getParentId(); - } - } - - public abstract String getViewId(); - - public abstract void setViewId(String viewId); - - public static UIConversationId newInstance() { - return (UIConversationId) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationName.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationName.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationName.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,35 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; - -import org.jboss.seam.navigation.ConversationIdParameter; -import org.jboss.seam.navigation.Pages; - -/** - * Embeds the natural conversation ID into the request. - * - * @author Shane Bryzak - */ -public abstract class UIConversationName extends UIParameter { - - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationName"; - - @Override - public String getName() - { - return "conversationName"; - } - - @Override - public Object getValue() - { - ConversationIdParameter param = Pages.instance().getConversationIdParameter(super.getValue().toString()); - return param != null ? param.getConversationId() : null; - } - - public static UIConversationName newInstance() { - return (UIConversationName) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,59 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; - -/** - * JSF component class - * - */ -public abstract class UIConversationPropagation extends UIParameter { - - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationPropagation"; - - @Override - public String getName() - { - return "conversationPropagation"; - } - - @Override - public Object getValue() - { - return getPageflow()==null ? getType() : getType() + "." + getPageflow(); - } - - public abstract String getPageflow(); - - public abstract void setPageflow(String pageflow); - - public abstract String getType(); - - public abstract void setType(String type); - - public static UIConversationPropagation newInstance() { - return (UIConversationPropagation) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDecorate.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDecorate.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,94 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.NamingContainer; -import javax.faces.component.UIComponent; -import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; - -import org.jboss.seam.ui.util.Decoration; - -public abstract class UIDecorate extends UIComponentBase implements NamingContainer -{ - - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Decorate"; - - public boolean hasMessage() - { - String clientId = getInputClientId(); - if (clientId==null) - { - return false; - } - else - { - return getFacesContext().getMessages(clientId).hasNext(); - } - } - - public String getInputId() - { - String id = getFor(); - if (id==null) - { - UIComponent evh = Decoration.getEditableValueHolder(this); - return evh==null ? null : evh.getId(); - } - else - { - return id; - } - } - - private String getInputClientId() - { - String id = getFor(); - if (id==null) - { - UIComponent evh = Decoration.getEditableValueHolder(this); - return evh==null ? null : evh.getClientId( getFacesContext() ); - } - else - { - // As UIDecorate implements NamingContainer it alters the search - // algorithm used by JSF - UIComponent component = null; - if (getParent() != null) - { - component = getParent().findComponent(id); - } - return component==null ? null : component.getClientId( getFacesContext() ); - } - } - - public abstract String getFor(); - - - public abstract void setFor(String forId); - - public abstract String getStyleClass(); - - public abstract void setStyleClass(String styleClass); - - public abstract String getStyle(); - - public abstract void setStyle(String style); - - public abstract boolean isEnclose(); - - public abstract void setEnclose(boolean enclose); - - public abstract String getElement(); - - public abstract void setElement(String element); - - public UIComponent getDecoration(String name) - { - return Decoration.getDecoration(name, this); - } - - public static UIDecorate newInstance() - { - return (UIDecorate) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDownload.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIDownload.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,14 +0,0 @@ -package org.jboss.seam.ui.component; - -/** - * - * @author Daniel Roth - * - */ -public abstract class UIDownload extends UILink -{ - public abstract String getSrc(); - - public abstract void setSrc(String src); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,55 +0,0 @@ - -package org.jboss.seam.ui.component; - -import javax.faces.component.UISelectItem; -import javax.faces.model.SelectItem; - -/** - * JSF component class - * - */ -public abstract class UIEnumItem extends UISelectItem -{ - - public abstract String getEnumValue(); - - public abstract void setEnumValue(String enumValue); - - public abstract void setLabel(String label); - - public abstract String getLabel(); - - @Override - public Object getItemValue() - { - return getEnumValue(); - } - - @Override - public void setItemValue(Object itemValue) - { - setEnumValue(itemValue == null ? null : itemValue.toString()); - } - - @Override - public String getItemLabel() - { - return getLabel(); - } - - @Override - public void setItemLabel(String itemLabel) - { - setLabel(itemLabel); - } - - @Override - public Object getValue() - { - Class c = getParent().getValueExpression("value").getType(getFacesContext().getELContext()); - String enumValue = getEnumValue(); - String label = getLabel(); - Object value = Enum.valueOf(c, enumValue); - return new SelectItem(value, label == null ? enumValue : label); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIEqualityValidator.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,33 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.UIComponentBase; - -/** - * UIComponent for validator - * - * @author Daniel Roth - */ -public abstract class UIEqualityValidator extends UIComponentBase -{ - - public abstract String getFor(); - - public abstract void setFor(String forId); - - public abstract String getMessage(); - - public abstract void setMessage(String message); - - public abstract String getMessageId(); - - public abstract void setMessageId(String messageId); - - public abstract void setOperator(String operator); - - public abstract String getOperator(); - - public abstract void setRequired(boolean required); - - public abstract boolean isRequired(); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,282 +0,0 @@ -package org.jboss.seam.ui.component; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; - - -import javax.el.ValueExpression; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; - -/** - * JSF component class - * - */ -public abstract class UIFileUpload extends UIInput -{ - - private String localContentType; - - private String localFileName; - - private Integer localFileSize; - - private InputStream localInputStream; - - @Override - public void processUpdates(FacesContext context) - { - - // Skip processing if rendered flag is false. - // this logic is in javax.faces.component.UIInput.processUpdates(FacesContext context) - if (!isRendered()) { - return; - } - - ValueExpression dataBinding = getValueExpression("data"); - if (dataBinding != null) - { - if (getLocalContentType() != null) - { - ValueExpression valueExpression = getValueExpression("contentType"); - if (valueExpression != null) - { - valueExpression.setValue(context.getELContext(), getLocalContentType()); - } - } - - if (getLocalFileName() != null) - { - ValueExpression valueExpression = getValueExpression("fileName"); - if (valueExpression != null) - { - valueExpression.setValue(context.getELContext(), getLocalFileName()); - } - } - - if (getLocalFileSize() != null) - { - ValueExpression valueExpression = getValueExpression("fileSize"); - if (valueExpression != null) - { - valueExpression.setValue(context.getELContext(), getLocalFileSize()); - } - } - - Class clazz = dataBinding.getType(context.getELContext()); - if (clazz.isAssignableFrom(InputStream.class)) - { - dataBinding.setValue(context.getELContext(), getLocalInputStream()); - } - else if (clazz.isAssignableFrom(byte[].class)) - { - byte[] bytes = null; - if (getLocalInputStream() != null) - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - try - { - byte[] buffer = new byte[512]; - int read = getLocalInputStream().read(buffer); - while (read != -1) - { - bos.write(buffer, 0, read); - read = getLocalInputStream().read(buffer); - } - bytes = bos.toByteArray(); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - dataBinding.setValue(context.getELContext(), bytes); - } - } - } - - public String getLocalContentType() - { - return localContentType; - } - - public void setLocalContentType(String localContentType) - { - this.localContentType = localContentType; - } - - public String getLocalFileName() - { - return localFileName; - } - - public void setLocalFileName(String localFileName) - { - this.localFileName = extractFilename(localFileName); - } - - /** - * Workaround for IE, which includes the full path to the file. - */ - private String extractFilename(String filename) - { - if (filename != null && filename.lastIndexOf("\\") > -1) - { - return filename.substring(filename.lastIndexOf("\\") + 1); - } - else - { - return filename; - } - } - - public Integer getLocalFileSize() - { - return localFileSize; - } - - public void setLocalFileSize(Integer localFileSize) - { - this.localFileSize = localFileSize; - } - - public InputStream getLocalInputStream() - { - return localInputStream; - } - - public void setLocalInputStream(InputStream localInputStream) - { - this.localInputStream = localInputStream; - } - - /** - * {@inheritDoc} - * - * @see javax.faces.component.UIOutput#getLocalValue() - */ - @Override - public Object getLocalValue() { - return new LocalUploadValue(localContentType, localFileName, localFileSize, - localInputStream); - } - - /** - * {@inheritDoc} - * - * @see javax.faces.component.UIInput#setValue(java.lang.Object) - */ - @Override - public void setValue(Object value) { - // Check if the local values get restored - if (value != null && value instanceof LocalUploadValue) { - LocalUploadValue localValue = (LocalUploadValue) value; - localFileName = localValue.getFileName(); - localFileSize = localValue.getFileSize(); - localContentType = localValue.getContentType(); - localInputStream = localValue.getInputStream(); - } else { - super.setValue(value); - } - } - - /** - * {@inheritDoc} - * - * @see javax.faces.component.UIInput#isLocalValueSet() - */ - @Override - public boolean isLocalValueSet() { - return localContentType != null || localFileName != null || localFileSize != null - || localInputStream != null; - } - - /** - * Helper class to store the local values. - */ - protected class LocalUploadValue { - - /** Stores the local content type. */ - private String contentType; - - /** Stores the local file name. */ - private String fileName; - - /** Stores the local file size. */ - private Integer fileSize; - - /** Stores the local stream information. */ - private InputStream inputStream; - - /** - * Constructor for this class. - * - * @param contentType - * The local content type to save - * @param fileName - * The local file name to save - * @param fileSize - * The local file size to save - * @param inputStream - * The local input stream to save - */ - public LocalUploadValue(String contentType, String fileName, Integer fileSize, - InputStream inputStream) { - super(); - this.contentType = contentType; - this.fileName = fileName; - this.fileSize = fileSize; - this.inputStream = inputStream; - } - - /** - * Returns the contentType value. - * - * @return the contentType value - */ - public String getContentType() { - return contentType; - } - - /** - * Returns the fileName value. - * - * @return the fileName value - */ - public String getFileName() { - return fileName; - } - - /** - * Returns the fileSize value. - * - * @return the fileSize value - */ - public Integer getFileSize() { - return fileSize; - } - - /** - * Returns the inputStream value. - * - * @return the inputStream value - */ - public InputStream getInputStream() { - return inputStream; - } - } - - public abstract void setAccept(String accept); - - public abstract String getAccept(); - - public abstract String getStyleClass(); - - public abstract String getStyle(); - - public abstract void setStyleClass(String styleClass); - - public abstract void setStyle(String style); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFormattedText.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,71 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import java.io.Reader; -import java.io.StringReader; - -import javax.faces.component.UIOutput; - -import org.jboss.seam.text.SeamTextLexer; -import org.jboss.seam.text.SeamTextParser; -import org.jboss.seam.log.Logging; -import org.jboss.seam.log.Log; - -import antlr.ANTLRException; -import antlr.RecognitionException; - -/** - * JSF component class - * - */ -public abstract class UIFormattedText extends UIOutput { - - Log log = Logging.getLog(UIFormattedText.class); - - @SuppressWarnings("unused") - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.FormattedText"; - - @SuppressWarnings("unused") - private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.FormattedText"; - - public String getFormattedText() - { - if ( getValue() == null) return null; - Reader r = new StringReader( (String) getValue() ); - SeamTextLexer lexer = new SeamTextLexer(r); - SeamTextParser parser = new SeamTextParser(lexer); - try - { - parser.startRule(); - } - catch (RecognitionException rex) { - // Log a nice message for any lexer/parser errors, users can disable this if they want to - log.warn( "Seam Text parse error: " + rex.getMessage() ); - } catch (ANTLRException ex) { - // All other errors are fatal; - throw new RuntimeException(ex); - } - return parser.toString(); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFragment.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFragment.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIFragment.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; - -/** - * JSF component class - * - */ -public abstract class UIFragment extends UIComponentBase { - - @SuppressWarnings("unused") - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Fragment"; - - @SuppressWarnings("unused") - private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Fragment"; - - public static UIFragment newInstance() { - return (UIFragment) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILabel.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILabel.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILabel.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,69 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UIComponent; -import javax.faces.component.html.HtmlOutputLabel; - - -public abstract class UILabel extends HtmlOutputLabel -{ - - /** - * A depth-first search for an EditableValueHolder - */ - protected static UIComponent getEditableValueHolder(UIComponent component) - { - if (component instanceof EditableValueHolder) - { - return component.isRendered() ? component : null; - } - for (Object child: component.getChildren()) - { - if (child instanceof UIComponent) - { - UIComponent evh = getEditableValueHolder( (UIComponent) child ); - if (evh!=null) return evh; - } - } - return null; - } - - private static String getInputId(UIComponent cmp) - { - String forId = cmp instanceof UIDecorate ? - ( (UIDecorate) cmp ).getFor() : null; - if (forId==null) - { - UIComponent evh = getEditableValueHolder(cmp); - return evh==null ? null : evh.getId(); - } - else - { - return forId; - } - } - - private static String getFor(UIComponent component) - { - - if ( component.getParent()==null ) - { - return null; - } - else if (component instanceof UIDecorate) - { - return getInputId(component); - } - else - { - return getFor( component.getParent() ); - } - } - - @Override - public String getFor() - { - return getFor(this); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILink.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UILink.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - - -/** - * JSF component class - * - */ -public abstract class UILink extends UISeamCommandBase { - - public abstract String getStyleClass(); - - public abstract void setStyleClass(String styleClass); - - public abstract String getStyle(); - - public abstract void setStyle(String style); - - public abstract boolean isDisabled(); - - public abstract void setDisabled(boolean disabled); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIMessage.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIMessage.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIMessage.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,92 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UIComponent; -import javax.faces.component.html.HtmlMessage; - -/** - * JSF component class - * - */ -public abstract class UIMessage extends HtmlMessage { - - /** - * A depth-first search for an EditableValueHolder - */ - protected static UIComponent getEditableValueHolder(UIComponent component) - { - if (component instanceof EditableValueHolder) - { - return component.isRendered() ? component : null; - } - for (Object child: component.getChildren()) - { - if (child instanceof UIComponent) - { - UIComponent evh = getEditableValueHolder( (UIComponent) child ); - if (evh!=null) return evh; - } - } - return null; - } - - private static String getInputId(UIComponent cmp) - { - String forId = cmp instanceof UIDecorate ? - ( (UIDecorate) cmp ).getFor() : null; - if (forId==null) - { - UIComponent evh = getEditableValueHolder(cmp); - return evh==null ? null : evh.getId(); - } - else - { - return forId; - } - } - - private static String getFor(UIComponent component) - { - - if ( component.getParent()==null ) - { - return null; - } - else if (component instanceof UIDecorate) - { - return getInputId(component); - } - else - { - return getFor( component.getParent() ); - } - } - - @Override - public String getFor() - { - return getFor(this); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIRemote.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIRemote.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIRemote.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,17 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.UIComponentBase; - -/** - * Tag that auto-generates script imports for Seam Remoting - * - * @author Shane Bryzak - */ -public abstract class UIRemote extends UIComponentBase -{ - - public abstract String getInclude(); - - public abstract void setInclude(String include); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIResource.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIResource.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,41 +0,0 @@ -package org.jboss.seam.ui.component; - -import java.io.IOException; - -import javax.faces.component.UIComponentBase; -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; - -/** - * @author Daniel Roth - */ -public abstract class UIResource extends UIComponentBase -{ - - public abstract Object getData(); - - public abstract void setData(Object data); - - public abstract String getContentType(); - - public abstract void setContentType(String contentType); - - public abstract String getDisposition(); - - public abstract void setDisposition(String disposition); - - public abstract String getFileName(); - - public abstract void setFileName(String fileName); - - @Override - public void encodeBegin(FacesContext arg0) throws IOException - { - if (!(getParent() instanceof UIViewRoot || getParent() instanceof UIDownload)) - { - throw new IllegalArgumentException("s:remote must be nested in a s:download or alone in the page"); - } - super.encodeBegin(arg0); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,232 +0,0 @@ -package org.jboss.seam.ui.component; - -import java.io.UnsupportedEncodingException; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.el.ValueExpression; -import javax.faces.component.ActionSource2; -import javax.faces.component.UIComponent; -import javax.faces.component.UIData; -import javax.faces.component.UIOutput; -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionListener; -import javax.faces.model.DataModel; - -import org.jboss.seam.core.PropagationType; -import org.jboss.seam.navigation.Pages; -import org.jboss.seam.ui.util.ViewUrlBuilder; -import org.jboss.seam.ui.util.cdk.MethodBindingToMethodExpression; - -public abstract class UISeamCommandBase extends UIOutput implements ActionSource2 -{ - - private static Class PORTLET_REQUEST; - - static - { - try - { - PORTLET_REQUEST = Class.forName("javax.portlet.PortletRequest"); - } - catch (Exception e) {} - } - - public abstract String getView(); - - public String getUrl() throws UnsupportedEncodingException - { - String encodedUrl; - FacesContext context = getFacesContext(); - String viewId = getView(); - if (viewId == null) - { - viewId = Pages.getViewId(getFacesContext()); - } - - ViewUrlBuilder url = new ViewUrlBuilder(viewId, getFragment(), !isPortletRequest(getFacesContext())); - - Set<String> usedParameters = new HashSet<String>(); - for (Object child : getChildren()) - { - if (child instanceof UIParameter) - { - usedParameters.add(((UIParameter) child).getName()); - url.addParameter((UIParameter) child); - } - } - - if (viewId != null && isIncludePageParams()) - { - Map<String, Object> pageParameters = Pages.instance().getStringValuesFromModel(context, viewId, usedParameters); - for (Map.Entry<String, Object> me : pageParameters.entrySet()) - { - UIParameter uip = new UIParameter(); - uip.setName(me.getKey()); - uip.setValue(me.getValue()); - url.addParameter(uip); - } - } - - if (getActionExpression() != null) - { - - UIAction uiAction = new UIAction(); - uiAction.setAction(getActionExpression().getExpressionString()); - url.addParameter(uiAction); - } - - PropagationType propagationType = PropagationType.valueOf(getPropagation().toUpperCase()); - if (propagationType == PropagationType.DEFAULT || propagationType == PropagationType.JOIN || - propagationType == PropagationType.NESTED || propagationType == PropagationType.END) - { - UIConversationId uiConversationId = UIConversationId.newInstance(); - uiConversationId.setViewId(viewId); - url.addParameter(uiConversationId); - } - - if (propagationType == PropagationType.JOIN || propagationType == PropagationType.NESTED || - propagationType == PropagationType.BEGIN || propagationType == PropagationType.END) - { - UIConversationPropagation uiPropagation = UIConversationPropagation.newInstance(); - uiPropagation.setType(getPropagation()); - uiPropagation.setPageflow(getPageflow()); - url.addParameter(uiPropagation); - } - - if (getConversationName() != null) - { - UIConversationName name = UIConversationName.newInstance(); - name.setValue(getConversationName()); - url.addParameter(name); - } - - ValueExpression taskInstanceValueExpression = getValueExpression("taskInstance"); - if (taskInstanceValueExpression != null) - { - UITaskId uiTaskId = UITaskId.newInstance(); - uiTaskId.setValueExpression("taskInstance", taskInstanceValueExpression); - url.addParameter(uiTaskId); - } - - if (!usedParameters.contains("dataModelSelection")) - { - UISelection uiSelection = getSelection(); - if (uiSelection != null) - { - url.addParameter(uiSelection); - } - } - encodedUrl = url.getEncodedUrl(); - - return encodedUrl; - } - - public abstract void setView(String view); - - public abstract String getPropagation(); - - public abstract void setPropagation(String propagtion); - - public abstract String getPageflow(); - - public abstract void setPageflow(String pageflow); - - public abstract String getFragment(); - - public abstract void setFragment(String fragment); - - public abstract void setConversationName(String name); - - public abstract String getConversationName(); - - public abstract void setIncludePageParams(boolean value); - - public abstract boolean isIncludePageParams(); - - public UISelection getSelection() - { - UIData parentUIData = getParentUIData(); - if (parentUIData != null) - { - if (parentUIData.getValue() instanceof DataModel) - { - String dataModelExpression = parentUIData.getValueExpression("value") - .getExpressionString(); - String dataModelName = dataModelExpression.substring(2, - dataModelExpression.length() - 1).replace('$', '.'); - UISelection uiSelection = UISelection.newInstance(); - uiSelection.setDataModel(dataModelName); - uiSelection.setVar(parentUIData.getVar()); - return uiSelection; - } - else - { - return null; - } - } - else - { - return null; - } - } - - - - public UIData getParentUIData() - { - UIComponent parent = this.getParent(); - while (parent != null) - { - if (parent instanceof UIData) - { - return (UIData) parent; - } - else - { - parent = parent.getParent(); - } - } - return null; - } - - public void removeActionListener(ActionListener listener) - { - // Silently fail, RF requires this - //throw new UnsupportedOperationException("Action listeners not supported by s:link/s:button"); - } - - public ActionListener[] getActionListeners() - { - // Silently fail, RF requires this - //throw new UnsupportedOperationException("Action listeners not supported by s:link/s:button"); - return null; - } - - public void addActionListener(ActionListener listener) - { - // Silently fail, RF requires this - //throw new UnsupportedOperationException("Action listeners not supported by s:link/s:button"); - } - - @Deprecated - public void setAction(javax.faces.el.MethodBinding methodBinding) - { - setActionExpression(new MethodBindingToMethodExpression(methodBinding)); - } - - @Deprecated - public javax.faces.el.MethodBinding getAction() - { - return new org.jboss.seam.ui.util.cdk.MethodExpressionToMethodBinding(getActionExpression()); - } - - private static boolean isPortletRequest(FacesContext facesContext) - { - return PORTLET_REQUEST !=null && - PORTLET_REQUEST.isInstance( facesContext.getExternalContext().getRequest() ); - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelectItems.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelectItems.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,318 +0,0 @@ -package org.jboss.seam.ui.component; - -import static org.jboss.seam.util.Strings.emptyIfNull; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.el.ValueExpression; -import javax.faces.FacesException; -import javax.faces.component.ValueHolder; -import javax.faces.convert.Converter; - -import javax.faces.model.DataModel; - -import org.jboss.seam.framework.Query; -import org.jboss.seam.ui.converter.ConverterChain; -import org.jboss.seam.ui.converter.NoSelectionConverter; - - -/** - * @auth Pete Muir - * - */ -public abstract class UISelectItems extends javax.faces.component.UISelectItems { - - private List<javax.faces.model.SelectItem> selectItems; - private Object originalValue; - - private class NullableSelectItem extends javax.faces.model.SelectItem - { - - private Object value; - - private NullableSelectItem(Object value, String label) - { - super.setLabel(label); - this.value = value; - } - - @Override - public Object getValue() - { - return value; - } - - } - - private abstract class ContextualSelectItem { - - private Object varValue; - - public ContextualSelectItem(Object varValue) - { - if (varValue == null) - { - throw new FacesException("var attribute must be set"); - } - this.varValue = varValue; - } - - /** - * @return the varValue - */ - protected Object getVarValue() - { - return this.varValue; - } - - private void setup() - { - getFacesContext().getExternalContext().getRequestMap().put(getVar(), varValue); - } - - private void cleanup() - { - getFacesContext().getExternalContext().getRequestMap().remove(getVar()); - } - - protected abstract Object getSelectItemValue(); - protected abstract String getSelectItemLabel(); - protected abstract Boolean getSelectItemDisabled(); - protected abstract Boolean getSelectItemEscape(); - - protected javax.faces.model.SelectItem create() - { - try - { - setup(); - return new javax.faces.model.SelectItem(this.getSelectItemValue(), this.getSelectItemLabel(), "", this.getSelectItemDisabled(), this.getSelectItemEscape()); - } - finally - { - cleanup(); - } - } - } - - private static final String NO_SELECTION_VALUE = null; - - /* Kinder impl of get/setLabel */ - - private String label; - - public String getLabel() - { - ValueExpression ve = getValueExpression("label"); - if (ve != null) - { - Object object = ve.getValue(getFacesContext().getELContext()); - if (object != null) - { - return object.toString(); - } - } - return label; - } - - public void setLabel(String label) - { - this.label = label; - } - - - public abstract void setHideNoSelectionLabel(Boolean hideNoSelectionLabel); - - public abstract Boolean getHideNoSelectionLabel(); - - public abstract String getNoSelectionLabel(); - - public abstract void setNoSelectionLabel(String noSelectionLabel); - - public abstract String getVar(); - - public abstract void setVar(String var); - - public abstract Boolean getDisabled(); - - public abstract void setDisabled(Boolean disabled); - - public abstract Boolean getEscape(); - - public abstract void setEscape(Boolean escape); - - public abstract Object getItemValue(); - - public abstract void setItemValue(Object itemValue); - - @Override - public Object getValue() - { - List<javax.faces.model.SelectItem> temporarySelectItems = new ArrayList<javax.faces.model.SelectItem>(); - javax.faces.model.SelectItem noSelectionLabel = noSelectionLabel(); - if (noSelectionLabel != null) - { - temporarySelectItems.add(noSelectionLabel); - } - if (selectItems == null || originalValue == null || !originalValue.equals(super.getValue())) - { - originalValue = super.getValue(); - selectItems = new ArrayList<javax.faces.model.SelectItem>(); - - if (originalValue instanceof Iterable) - { - selectItems.addAll(asSelectItems((Iterable) originalValue)); - } - else if (originalValue instanceof DataModel && ((DataModel) originalValue).getWrappedData() instanceof Iterable) - { - selectItems.addAll(asSelectItems((Iterable) ((DataModel) originalValue).getWrappedData())); - } - else if (originalValue instanceof Query) - { - selectItems.addAll(asSelectItems(((Query) originalValue).getResultList())); - } - else if (originalValue != null && originalValue.getClass().isArray()) - { - selectItems.addAll(asSelectItems(arrayAsList(originalValue))); - } - else if (temporarySelectItems.size() == 0) - { - return originalValue; - } - - } - temporarySelectItems.addAll(selectItems); - return temporarySelectItems; - } - - private List<javax.faces.model.SelectItem> asSelectItems(Iterable iterable) - { - List<javax.faces.model.SelectItem> selectItems = new ArrayList<javax.faces.model.SelectItem>(); - for (final Object o : iterable) - { - selectItems.add(new ContextualSelectItem(o) - { - - @Override - protected Boolean getSelectItemDisabled() - { - Boolean disabled = getDisabled(); - return disabled == null ? false : disabled; - } - - @Override - protected Boolean getSelectItemEscape() - { - Boolean escape = getEscape(); - return escape == null ? true : escape; - } - - @Override - protected String getSelectItemLabel() - { - return emptyIfNull(getLabel()); - } - - @Override - protected Object getSelectItemValue() - { - Object value = getItemValue(); - return value == null ? getVarValue() : value; - } - - }.create()); - } - return selectItems; - } - - - - private javax.faces.model.SelectItem noSelectionLabel() - { - if (isShowNoSelectionLabel()) - { - NullableSelectItem s = new NullableSelectItem(NO_SELECTION_VALUE, getNoSelectionLabel()); - ConverterChain converterChain = new ConverterChain(this.getParent()); - Converter noSelectionConverter = new NoSelectionConverter(); - // Make sure that the converter is only added once - if (!converterChain.containsConverterType(noSelectionConverter)) { - converterChain.addConverterToChain(noSelectionConverter, ConverterChain.CHAIN_START); - } - return s; - } - else - { - return null; - } - } - - private boolean isShowNoSelectionLabel() - { - ValueExpression vb = getValueExpression("noSelectionLabel"); - String noSelectionLabel = getNoSelectionLabel(); - Boolean hideNoSelectionLabel = getHideNoSelectionLabel(); - Object parentValue = getParentValue(); - - /* - * This is a slight hack. If you do an EL expresison like this (to hide the label) - * - * noSelectionLabel="#{x eq y ? 'Please Select' : null}" - * - * then, if x != y, EL will return an empty String, not null, so we work around that, with the side effect - * that if the result of the EL expression is an empty String, then the label will be hidden. - */ - if (noSelectionLabel != null && vb == null && !(hideNoSelectionLabel && parentValue != null)) - { - /* - * Here, the user has specfied a noSelectionLabel (may be an empty string), and, if hideNoSelectionLabel - * is set, then, if a value is selected, then the label is hidden - */ - return true; - } - else if (noSelectionLabel != null && !"".equals(noSelectionLabel) && !(hideNoSelectionLabel && parentValue != null)) - { - /* - * Here, the user has used an EL expression as the noSelectionLabel. In this case, an empty string is - * indicates that the label should be hidden. - */ - return true; - } - else - { - return false; - } - } - - private Object getParentValue() - { - if (getParent() instanceof ValueHolder) - { - ValueHolder parent = (ValueHolder) getParent(); - return parent.getValue(); - } - else - { - return null; - } - } - - private static List arrayAsList(Object array) - { - if (array.getClass().getComponentType().isPrimitive()) - { - List list = new ArrayList(); - for (int i = 0; i < Array.getLength(array); i++) - { - list.add(Array.get(array, i)); - } - return list; - } - else - { - return Arrays.asList((Object[]) array); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelection.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelection.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISelection.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,71 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; -import javax.faces.model.DataModel; - -import org.jboss.seam.contexts.Contexts; - -/** - * JSF component class - * - */ -public abstract class UISelection extends UIParameter { - - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Selection"; - - @Override - public String getName() - { - return "dataModelSelection"; - } - - @Override - public Object getValue() - { - Object value = Contexts.lookupInStatefulContexts(getDataModel()); - if (value==null) - { - return null; - } - else - { - int rowIndex = ( (DataModel) value ).getRowIndex(); - return rowIndex<0 ? null : getVar() + ':' + getDataModel() + '[' + rowIndex + ']'; - } - } - - public abstract String getDataModel(); - - public abstract void setDataModel(String dataModel); - - public abstract String getVar(); - - public abstract void setVar(String var); - - public static UISelection newInstance() { - return (UISelection) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISpan.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UISpan.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,10 +0,0 @@ -package org.jboss.seam.ui.component; - -public abstract class UISpan extends UIStyle -{ - - public abstract String getTitle(); - - public abstract void setTitle(String title); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIStyle.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIStyle.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIStyle.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,17 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.UIComponentBase; - - -public abstract class UIStyle extends UIComponentBase -{ - - public abstract String getStyleClass(); - - public abstract String getStyle(); - - public abstract void setStyleClass(String styleClass); - - public abstract void setStyle(String style); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UITaskId.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UITaskId.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UITaskId.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,56 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.component; - -import javax.el.ValueExpression; -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; - -import org.jbpm.taskmgmt.exe.TaskInstance; - -/** - * JSF component class - * - */ -public abstract class UITaskId extends UIParameter { - - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.TaskId"; - - @Override - public String getName() - { - return "taskId"; - } - - @Override - public Object getValue() - { - ValueExpression valueExpression = getValueExpression("taskInstance"); - if (valueExpression==null) valueExpression = getFacesContext().getApplication().getExpressionFactory().createValueExpression(getFacesContext().getELContext(), "#{task}", TaskInstance.class); - TaskInstance taskInstance = (TaskInstance) valueExpression.getValue( getFacesContext().getELContext() ); - return taskInstance==null ? null : taskInstance.getId(); - } - - public static UITaskId newInstance() { - return (UITaskId) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIToken.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIToken.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIToken.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,126 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.UIComponent; -import javax.faces.component.UIForm; -import javax.faces.component.UIOutput; - -import org.jboss.seam.Component; -import org.jboss.seam.ui.ClientUidSelector; -import org.jboss.seam.ui.UnauthorizedCommandException; - -/** - * <p> - * <strong>UIToken</strong> is a UIComponent that produces a random token that - * is inserted into a hidden form field to help to secure JSF form posts against - * cross-site request forgery (XSRF) attacks. This is an adaptation of the - * recommendation called Keyed‐Hashing for Message Authentication that is - * referenced in the Cross Site Reference Forgery by Jesse Burns - * (http://www.isecpartners.com/files/XSRF_Paper_0.pdf) - * </p> - * - * <p> - * When placed inside a form, this component will first assign a unique - * identifier to the browser using a cookie that lives until the end of the - * browser session. This is roughly the browser's private key. Then a unique - * token is generated using various pieces of information that comprise the - * form's signature. The token may or may not be bound to the session id, as - * indicated by the value of the requireSession attribute. The token value is - * stored in the hidden form field named javax.faces.FormSignature. - * </p> - * - * <p> - * There is an assumption when using this component that the browser supports - * cookies. Cookies are the only universally available persistent mechanism that - * can give the browser an identifiable signature. It's important to know that - * the browser submitting the form is the same browser that is requesting the - * form. - * </p> - * - * <p> - * During the decode process, the token is generated using the same algorithm - * that was used during rendering and compared with the value of the request - * parameter javax.faces.FormSignature. If the same token value can be produced, - * then the form submission is permitted. Otherwise, an - * {@link UnauthorizedCommandException} is thrown indicating the reason for the - * failure. - * </p> - * - * <p> - * The UIToken can be combined with client-side state saving or the - * "build before restore" strategy to unbind a POST from the session that - * created the view without sacrificing security. However, it's still the most - * secure to require the view state to be present in the session (JSF 1.2 - * server-side state saving). - * </p> - * - * <p> - * Please note that this solution isn't a complete panacea. If your site is - * vulnerable to XSS or the connection to wire-tapping, then the unique browser - * identifier can be revealed and a request forged. - * </p> - * - * @author Dan Allen - */ -public abstract class UIToken extends UIOutput -{ - @SuppressWarnings("unused") - private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Token"; - - @SuppressWarnings("unused") - private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Token"; - - /** - * Indicates whether the session id should be included in the form signature, - * hence binding the token to the session. This value can be set to false - * if the "build before restore" mode of Facelets is activated (the - * default in JSF 2.0). The default value is false. - */ - public abstract boolean isRequireSession(); - - public abstract void setRequireSession(boolean required); - - /** - * Indicates whether a JavaScript check should be inserted into the page to - * verify that cookies are enabled in the browser. If cookies are not - * enabled, present a notice to the user that form posts will not work. - * The default value is false. - */ - public abstract boolean isEnableCookieNotice(); - - public abstract void setEnableCookieNotice(boolean state); - - /** - * Indicates whether to allow the same form to be submitted multiple times - * with the same signature (as long as the view does not change). This is a - * common need if the form is perform Ajax calls but not rerendering itself - * or, at the very least, the UIToken component. The preferred approach is to - * have the UIToken component rerendered on any Ajax call where the UIToken - * component would be processed. The default value is false. - */ - public abstract boolean isAllowMultiplePosts(); - - public abstract void setAllowMultiplePosts(boolean allow); - - /** - * Return the selector that controls the unique browser identifier cookie. - */ - public ClientUidSelector getClientUidSelector() { - return (ClientUidSelector) Component.getInstance(ClientUidSelector.class); - } - - public String getClientUid() { - return getClientUidSelector().getClientUid(); - } - - public UIForm getParentForm() { - UIComponent parent = getParent(); - while (parent != null) { - if (parent instanceof UIForm) { - return (UIForm) parent; - } - parent = parent.getParent(); - } - - return null; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,24 +0,0 @@ -package org.jboss.seam.ui.component; - -import javax.faces.component.UIComponentBase; - -/** - * JSF component class - * - */ -public abstract class UIValidateAll extends UIComponentBase -{ - - // TODO Make this a hidden=true, el=false property in validateAll.xml - private boolean validatorsAdded = false; - - public boolean isValidatorsAdded() - { - return validatorsAdded; - } - - public void setValidatorsAdded(boolean validatorsAdded) - { - this.validatorsAdded = validatorsAdded; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicBooleanConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,44 +0,0 @@ -package org.jboss.seam.ui.converter; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -/** - * @author Dennis Byrne - */ - -public class AtomicBooleanConverter implements Converter -{ - - public Object getAsObject(FacesContext ctx, UIComponent ui, String string) - { - return string != null && string.trim().length() > 0 ? new AtomicBoolean(Boolean.parseBoolean(string.trim())) : null; - } - - public String getAsString(FacesContext ctx, UIComponent ui, Object object) - { - String string = ""; - if (object != null) - { - if (object instanceof String) - { - string = (String) object; - } - else if (object instanceof AtomicBoolean) - { - string = ((AtomicBoolean) object).toString(); - } - else - { - throw new ConverterException("Received an instance of " + object.getClass().getName() + ", but was expecting an instance of " + AtomicInteger.class.getName()); - } - } - return string; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicIntegerConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,55 +0,0 @@ -package org.jboss.seam.ui.converter; - -import java.util.concurrent.atomic.AtomicInteger; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -/** - * @author Dennis Byrne - */ - -public class AtomicIntegerConverter implements Converter -{ - - public Object getAsObject(FacesContext ctx, UIComponent ui, String value) - { - Object object = null; - if (value != null && value.trim().length() > 0) - { - try - { - object = new AtomicInteger(Integer.parseInt(value.trim())); - } - catch (NumberFormatException nfe) - { - throw new ConverterException(nfe); - } - } - return object; - } - - public String getAsString(FacesContext ctx, UIComponent ui, Object object) - { - String string = ""; - if (object != null) - { - if (object instanceof String) - { - string = (String) object; - } - else if (object instanceof AtomicInteger) - { - string = ((AtomicInteger) object).toString(); - } - else - { - throw new ConverterException("Received an instance of " + object.getClass().getName() + ", but was expecting an instance of " + AtomicInteger.class.getName()); - } - } - return string; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/AtomicLongConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,54 +0,0 @@ -package org.jboss.seam.ui.converter; - -import java.util.concurrent.atomic.AtomicLong; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -/** - * @author Dennis Byrne - */ - -public class AtomicLongConverter implements Converter -{ - - public Object getAsObject(FacesContext ctx, UIComponent ui, String value) - { - Object object = null; - if (value != null && value.trim().length() > 0) - { - try - { - object = new AtomicLong(Long.parseLong(value.trim())); - } - catch (NumberFormatException nfe) - { - throw new ConverterException(nfe); - } - } - return object; - } - - public String getAsString(FacesContext ctx, UIComponent ui, Object object) - { - String string = ""; - if (object != null) - { - if (object instanceof String) - { - string = (String) object; - } - else if (object instanceof AtomicLong) - { - string = ((AtomicLong) object).toString(); - } - else - { - throw new ConverterException("Received an instance of " + object.getClass().getName() + ", but was expecting an instance of " + AtomicLong.class.getName()); - } - } - return string; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/ConverterChain.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,230 +0,0 @@ -package org.jboss.seam.ui.converter; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.el.ValueExpression; -import javax.faces.component.StateHolder; -import javax.faces.component.UIComponent; -import javax.faces.component.UIComponentBase; -import javax.faces.component.ValueHolder; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -/** - * This class provides a chainable converter for JSF. - * - * Any JSF converter can be placed at the end of the chain. A converter that is - * placed higher up the chain should return ConverterChain.CONTINUE if - * conversion has failed. If the all converters run return - * ConverterChain.CONTINUE an unconverted value will be returned. - * - * A converter can be placed in the chain with a priority, the order in which - * converters with the same priority is run is not specified. - * - */ -public class ConverterChain implements Converter, StateHolder -{ - - public static final String CONTINUE = "org.jboss.seam.ui.ConverterChain.continue"; - - /** - * This places the converter at the end of the chain. No garuntee is made - * about the order converters which are placed on the queue with this - * priority will be run - */ - public static final int CHAIN_END = Integer.MAX_VALUE; - - /** - * This places the converter at the head of the chain. No garuntee is made - * about the order converters which are placed on the queue with this - * priority will be run - */ - public static final int CHAIN_START = 0; - - private List<PrioritizableConverter> converters; - - private boolean dirty; - - public ConverterChain() - { - // A Priority Queue would be nice but JSF has issues serializing that - converters = new ArrayList<PrioritizableConverter>(); - } - - /** - * Set up a ConverterChain for this component. - * - * This replaces any existing converter with a ConverterChain with the - * existing Converter at the end of the chain - * - * @param component - */ - public ConverterChain(UIComponent component) - { - this(); - if (component instanceof ValueHolder) - { - ValueHolder valueHolder = (ValueHolder) component; - if (!(valueHolder.getConverter() instanceof ConverterChain)) - { - ValueExpression converterValueExpression = component.getValueExpression("converter"); - if (converterValueExpression != null) - { - addConverterToChain(converterValueExpression); - } - else if (valueHolder.getConverter() != null) - { - addConverterToChain(valueHolder.getConverter()); - } - else - { - ValueExpression valueExpression = component.getValueExpression("value"); - FacesContext facesContext = FacesContext.getCurrentInstance(); - if (valueExpression != null) - { - Class<?> type = valueExpression.getType(facesContext.getELContext()); - if (type != null) - { - Converter converter = facesContext.getApplication().createConverter(type); - if (converter != null) - { - addConverterToChain(converter); - } - } - } - } - valueHolder.setConverter(this); - } - } - } - - public Object getAsObject(FacesContext context, UIComponent component, String value) - throws ConverterException - { - Object output = value; - for (Converter converter : getConverters()) - { - Object result = converter.getAsObject(context, component, value); - if (!CONTINUE.equals(result)) - { - output = result; - break; - } - } - return output; - } - - public String getAsString(FacesContext context, UIComponent component, Object value) - throws ConverterException - { - String output = value == null ? null : value.toString(); - for (Converter converter : getConverters()) - { - String result = converter.getAsString(context, component, value); - if (!CONTINUE.equals(result)) - { - output = result; - break; - } - } - return output; - } - - /** - * Add a converter to the end of the chain - */ - public boolean addConverterToChain(Converter c) - { - return addConverterToChain(c, CHAIN_END); - } - - /** - * Add a converter to the end of the chain - */ - public boolean addConverterToChain(ValueExpression c) - { - return addConverterToChain(c, CHAIN_END); - } - - /** - * Add a converter to the chain with a defined priority - */ - public boolean addConverterToChain(Converter c, int priority) - { - if (c != null) - { - dirty = true; - return converters.add(new PrioritizableConverter(c, priority)); - } - else - { - return false; - } - } - - /** - * Add a converter to the chain with a defined priority - */ - public boolean addConverterToChain(ValueExpression c, int priority) - { - if (c != null) - { - dirty = true; - return converters.add(new PrioritizableConverter(c, priority)); - } - else - { - return false; - } - } - - private boolean _transient; - - public boolean isTransient() - { - return _transient; - } - - public void restoreState(FacesContext context, Object state) - { - Object[] values = (Object[]) state; - converters = (List<PrioritizableConverter>) UIComponentBase.restoreAttachedState(context, - values[0]); - dirty = true; - } - - public Object saveState(FacesContext context) - { - Object[] values = new Object[1]; - values[0] = UIComponentBase.saveAttachedState(context, converters); - return values; - } - - public void setTransient(boolean newTransientValue) - { - this._transient = newTransientValue; - - } - - private List<PrioritizableConverter> getConverters() - { - if (dirty) - { - Collections.sort(converters); - } - return converters; - } - - public boolean containsConverterType(Converter converter) { - // TODO Improve this - for (Converter c : converters) { - if (c.getClass().equals(converter.getClass())) { - return true; - } - } - return false; - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/DateTimeConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,48 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.converter; - -import java.util.TimeZone; - -import org.jboss.seam.contexts.Contexts; - -public class DateTimeConverter extends javax.faces.convert.DateTimeConverter{ - - public DateTimeConverter() - { - setTimeZone( getTimeZone() ); - } - - @Override - public TimeZone getTimeZone() - { - if ( Contexts.isApplicationContextActive() ) - { - return org.jboss.seam.international.TimeZone.instance(); - } - else - { - return TimeZone.getDefault(); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/EnumConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,65 +0,0 @@ -package org.jboss.seam.ui.converter; - -import java.util.Collection; - -import javax.el.ValueExpression; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.ConverterException; - -public class EnumConverter implements javax.faces.convert.Converter -{ - public Object getAsObject(FacesContext context, UIComponent comp, String value) - throws ConverterException - { - ValueExpression expr = comp.getValueExpression("value"); - - Class enumType = expr == null ? null : expr.getType(context.getELContext()); - if (enumType != null && enumType.isEnum()) - { - return Enum.valueOf(enumType, value); - } - else - { - for (Object child : comp.getChildren()) - { - if (child instanceof UIComponent) - { - UIComponent c = (UIComponent) child; - expr = c.getValueExpression("value"); - Object val = expr == null ? null : expr.getValue(context.getELContext()); - if (val == null) - { - throw new ConverterException("Cannot get items"); - } - - Class t = val.getClass(); - if (t.isArray() && t.getComponentType().isEnum()) - { - return Enum.valueOf(t.getComponentType(), value); - } - else if (val instanceof Collection) - { - Object firstItem = ((Collection) val).iterator().next(); - if (firstItem instanceof Enum) { - t = ((Enum) firstItem).getDeclaringClass(); - } else { - t = firstItem.getClass(); - } - - return Enum.valueOf(t, value); - } - } - } - } - - throw new ConverterException("Unable to find selectItems with enum values."); - } - - public String getAsString(FacesContext context, UIComponent component, Object object) - throws ConverterException - { - return object == null ? null : ((Enum) object).name(); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/NoSelectionConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,32 +0,0 @@ -package org.jboss.seam.ui.converter; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -public class NoSelectionConverter implements Converter -{ - public static final String NO_SELECTION_VALUE = "org.jboss.seam.ui.NoSelectionConverter.noSelectionValue"; - - public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException - { - if (value == null) { - return null; - } else if (value.equals(NO_SELECTION_VALUE)) { - return null; - } else { - return ConverterChain.CONTINUE; - } - } - - public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException - { - if (value == null) { - return NO_SELECTION_VALUE; - } else { - return ConverterChain.CONTINUE; - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/converter/PrioritizableConverter.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,104 +0,0 @@ -package org.jboss.seam.ui.converter; - -import javax.el.ValueExpression; -import javax.faces.component.StateHolder; -import javax.faces.component.UIComponent; -import javax.faces.component.UIComponentBase; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -/** - * Helper class for ConverterChain - * - */ -public class PrioritizableConverter implements Converter, Comparable<PrioritizableConverter>, - StateHolder -{ - - private ValueExpression valueExpression; - - private Converter delegate; - - private int priority; - - public PrioritizableConverter() - { - } - - public PrioritizableConverter(ValueExpression vb, int priority) - { - this.valueExpression = vb; - this.priority = priority; - } - - public PrioritizableConverter(Converter delegate, int priority) - { - this.delegate = delegate; - this.priority = priority; - } - - public Converter getDelegate() - { - if (valueExpression != null) - { - return (Converter) valueExpression.getValue(FacesContext.getCurrentInstance().getELContext()); - } - else - { - return delegate; - } - } - - public int getPriority() - { - return priority; - } - - public Object getAsObject(FacesContext context, UIComponent component, String value) - throws ConverterException - { - return getDelegate().getAsObject(context, component, value); - } - - public String getAsString(FacesContext context, UIComponent component, Object value) - throws ConverterException - { - return getDelegate().getAsString(context, component, value); - } - - public int compareTo(PrioritizableConverter o) - { - return this.getPriority() - o.getPriority(); - } - - private boolean _transient; - - public boolean isTransient() - { - return _transient; - } - - public void restoreState(FacesContext context, Object state) - { - Object[] values = (Object[]) state; - delegate = (Converter) UIComponentBase.restoreAttachedState(context, values[0]); - priority = (Integer) values[1]; - valueExpression = (ValueExpression) values[2]; - } - - public Object saveState(FacesContext context) - { - Object[] values = new Object[3]; - values[0] = UIComponentBase.saveAttachedState(context, delegate); - values[1] = priority; - values[2] = valueExpression; - return values; - } - - public void setTransient(boolean newTransientValue) - { - this._transient = newTransientValue; - - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletCompiler.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,61 +0,0 @@ -package org.jboss.seam.ui.facelet; - -import static org.jboss.seam.ScopeType.APPLICATION; - -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Unwrap; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.contexts.Contexts; - -import com.sun.faces.application.ApplicationAssociate; -import com.sun.faces.facelets.compiler.SAXCompiler; - -@Name("org.jboss.seam.ui.faces.facelet.faceletCompiler") -@Scope(APPLICATION) -@BypassInterceptors -@AutoCreate -@Install(value = true, precedence = Install.BUILT_IN, classDependencies="com.sun.faces.facelets.Facelet") -public class FaceletCompiler -{ - - private com.sun.faces.facelets.compiler.Compiler compiler; - - @Create - public void create() - { - ApplicationAssociate applicationAssociate = ApplicationAssociate.getCurrentInstance(); - if (applicationAssociate != null) - { - compiler = applicationAssociate.getCompiler(); - } - else - { - // TODO: this requires to initialize custom tag library - compiler = new SAXCompiler(); - } - } - - - @Unwrap - public com.sun.faces.facelets.compiler.Compiler unwrap() - { - return compiler; - } - - public static com.sun.faces.facelets.compiler.Compiler instance() - { - if ( !Contexts.isApplicationContextActive() ) - { - throw new IllegalStateException("No active application scope"); - } - return (com.sun.faces.facelets.compiler.Compiler) Component.getInstance(FaceletCompiler.class, ScopeType.APPLICATION); - } - -} - Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsJBossLogging.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,111 +0,0 @@ -package org.jboss.seam.ui.facelet; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.lang.reflect.Field; -import java.util.logging.Filter; -import java.util.logging.Logger; - -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Startup; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.interop.jul.Log4JConversionFilter; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.util.Reflections; - -import com.sun.faces.facelets.impl.DefaultFaceletFactory; -import com.sun.faces.facelets.tag.jsf.core.ViewHandler; -import com.sun.faces.facelets.util.Resource; -import javax.faces.view.facelets.ComponentHandler; - -@Name("org.jboss.seam.ui.facelet.faceletsJBossLogging") -@Scope(APPLICATION) -@Install(classDependencies={"com.sun.faces.facelets.Facelet", "org.jboss.logging.Logger", "org.apache.log4j.Logger", "org.jboss.seam.interop.jul.Log4JConversionFilter"}, precedence=BUILT_IN) -@Startup -@BypassInterceptors -public class FaceletsJBossLogging -{ - - private LogProvider log = Logging.getLogProvider(FaceletsJBossLogging.class); - - @SuppressWarnings("deprecation") - @Create - public void create() - { - Filter conversionFilter = null; - try - { - conversionFilter = new Log4JConversionFilter(); - } - catch (Exception e) - { - // Filter isn't installed in the container - return; - } - try - { - - - java.util.logging.Logger julLogger; - - // Gah have to do this by reflection as the loggers are protected - - // And some aren't static, so this really is best effort - -// julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log"); -// julLogger.setFilter(conversionFilter); - - julLogger = getPrivateStaticLogger(com.sun.faces.facelets.compiler.Compiler.class, "log"); - julLogger.setFilter(conversionFilter); - - julLogger = getPrivateStaticLogger(DefaultFaceletFactory.class, "log"); - julLogger.setFilter(conversionFilter); - -// julLogger = getPrivateStaticLogger(TagLibraryConfig.class, "log"); -// julLogger.setFilter(conversionFilter); - -// julLogger = getPrivateStaticLogger(ComponentHandler.class, "log"); -// julLogger.setFilter(conversionFilter); - - julLogger = getPrivateStaticLogger(Resource.class, "log"); - julLogger.setFilter(conversionFilter); - -// julLogger = getPrivateStaticLogger(ViewHandler.class, "log"); -// julLogger.setFilter(conversionFilter); - - // These ones are in a package-scoped class - - julLogger = getPrivateStaticLogger("com.sun.faces.facelets.compiler.CompilationManager", "log"); - julLogger.setFilter(conversionFilter); - - julLogger = getPrivateStaticLogger("com.sun.faces.facelets.tag.jsf.ComponentRule", "log"); - julLogger.setFilter(conversionFilter); - -// julLogger = getPrivateStaticLogger("com.sun.faces.facelets.tag.MetaRulesetImpl", "log"); -// julLogger.setFilter(conversionFilter); - - } - catch (Exception e) - { - log.warn("Unable to wrap Facelets JDK logging in Log4j logging", e); - } - } - - private Logger getPrivateStaticLogger(Class clazz, String fieldName) throws Exception - { - Field field = Reflections.getField(clazz, fieldName); - field.setAccessible(true); - return (Logger) Reflections.get(field, new Object()); - } - - private Logger getPrivateStaticLogger(String className, String fieldName) throws Exception - { - return getPrivateStaticLogger(Reflections.classForName(className), fieldName); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/FaceletsRenderer.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,52 +0,0 @@ -package org.jboss.seam.ui.facelet; - -import java.io.IOException; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.faces.Renderer; - -/** - * - * Implementation of Renderer using Facelets - * - * Especially useful for sending email using Seam Mail - * - * @author Pete Muir - * @author Norman Richards - * - */ - -(a)Scope(ScopeType.STATELESS) -@BypassInterceptors -@Name("org.jboss.seam.faces.renderer") -@AutoCreate -@Install(value = true, precedence = Install.BUILT_IN, classDependencies="com.sun.faces.facelets.Facelet") -public class FaceletsRenderer extends Renderer -{ - - - /** - * Render the viewId, anything written to the JSF ResponseWriter is - * returned - */ - @Override - public String render(final String viewId) - { - RendererRequest rendererRequest = new RendererRequest(viewId); - try - { - rendererRequest.run(); - } - catch (IOException e) - { - throw new RuntimeException("error rendering " + viewId, e); - } - return rendererRequest.getOutput(); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/HttpSessionManager.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,48 +0,0 @@ -package org.jboss.seam.ui.facelet; - -import static org.jboss.seam.ScopeType.SESSION; - -import java.io.Serializable; - -import javax.servlet.http.HttpSession; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Unwrap; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.mock.MockHttpSession; - -@Name("org.jboss.seam.ui.facelet.mockHttpSession") -@Scope(SESSION) -@BypassInterceptors -@Install(dependencies="org.jboss.seam.faces.renderer") -@AutoCreate -public class HttpSessionManager implements Serializable -{ - - private transient HttpSession session; - - @Unwrap - public HttpSession getSession() - { - if (session == null) - { - this.session = new MockHttpSession(ServletContextManager.instance()); - } - return session; - } - - public static HttpSession instance() - { - if (!Contexts.isSessionContextActive()) - { - throw new IllegalStateException("Session context is not active"); - } - return (HttpSession) Component.getInstance(HttpSessionManager.class, SESSION); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererFacesContextFactory.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererFacesContextFactory.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererFacesContextFactory.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,75 +0,0 @@ -package org.jboss.seam.ui.facelet; - -import static org.jboss.seam.ScopeType.APPLICATION; - -import javax.faces.FactoryFinder; -import javax.faces.context.FacesContext; -import javax.faces.lifecycle.Lifecycle; -import javax.faces.lifecycle.LifecycleFactory; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.contexts.Contexts; - - -/** - * A copy of the FacesServlet for use in our Renderer. - * - * Shamelessly adapted from the RI - * - * @author Pete Muir - * - */ - -@Name("org.jboss.seam.ui.facelet.facesContextFactory") -@Scope(APPLICATION) -@BypassInterceptors -@Install(dependencies="org.jboss.seam.faces.renderer") -@AutoCreate -public class RendererFacesContextFactory -{ - - private javax.faces.context.FacesContextFactory facesContextFactory; - private Lifecycle lifecycle; - - @Create - public void create() - { - // Acquire our FacesContextFactory instance - facesContextFactory = (javax.faces.context.FacesContextFactory) FactoryFinder.getFactory (FactoryFinder.FACES_CONTEXT_FACTORY); - - // Acquire our Lifecycle instance - LifecycleFactory lifecycleFactory = (LifecycleFactory) FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY); - lifecycle = lifecycleFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE); - } - - public FacesContext getFacesContext(ServletRequest request, ServletResponse response) - { - return facesContextFactory.getFacesContext(ServletContextManager.instance(), request, response, lifecycle); - } - - @Destroy - public void destroy() - { - facesContextFactory = null; - lifecycle = null; - } - - public static RendererFacesContextFactory instance() - { - if (!Contexts.isApplicationContextActive()) - { - throw new IllegalStateException("Application context is not active"); - } - return (RendererFacesContextFactory) Component.getInstance(RendererFacesContextFactory.class, APPLICATION); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/RendererRequest.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,140 +0,0 @@ -package org.jboss.seam.ui.facelet; - -import java.io.IOException; -import java.io.StringWriter; -import java.lang.ref.WeakReference; -import java.net.URL; - -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; -import javax.servlet.ServletContext; - -import org.jboss.seam.core.ResourceLoader; -import org.jboss.seam.jsf.DelegatingFacesContext; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.mock.MockHttpServletRequest; -import org.jboss.seam.mock.MockHttpServletResponse; -import org.jboss.seam.ui.util.JSF; - -import com.sun.faces.application.ApplicationAssociate; -import com.sun.faces.facelets.Facelet; - -public class RendererRequest -{ - private static final LogProvider log = Logging.getLogProvider(RendererRequest.class); - - private FacesContext originalFacesContext; - private FacesContext facesContext; - - private MockHttpServletRequest request; - private MockHttpServletResponse response; - - private StringWriter writer; - - private String viewId; - - private ClassLoader originalClassLoader; - - public RendererRequest(String viewId) - { - this.viewId = viewId; - } - - private void init() - { - if (FacesContext.getCurrentInstance() != null) { - request = new MockHttpServletRequest(HttpSessionManager.instance(), FacesContext.getCurrentInstance().getExternalContext()); - } else { - request = new MockHttpServletRequest(HttpSessionManager.instance()); - } - response = new MockHttpServletResponse(); - - setContextClassLoader(); - - // Generate the FacesContext from the JSF FacesContextFactory - originalFacesContext = FacesContext.getCurrentInstance(); - facesContext = RendererFacesContextFactory.instance().getFacesContext(request, response); - DelegatingFacesContext.setCurrentInstance(facesContext); - - // Create the viewRoot - UIViewRoot newRoot = facesContext.getApplication().getViewHandler().createView(facesContext, viewId); - facesContext.setViewRoot(newRoot); - - // Set the responseWriter to write to a buffer - writer = new StringWriter(); - facesContext.setResponseWriter(facesContext.getRenderKit().createResponseWriter(writer, - null, null)); - } - - private void cleanup() - { - facesContext.release(); - DelegatingFacesContext.setCurrentInstance(originalFacesContext); - - originalFacesContext = null; - facesContext = null; - request = null; - response = null; - } - - protected void setContextClassLoader() { - // JBSEAM-3555 Quick fix - // Set the context classloader to the cached one - originalClassLoader = Thread.currentThread().getContextClassLoader(); - ServletContext ctx = request.getSession().getServletContext(); - WeakReference<ClassLoader> ref = (WeakReference<ClassLoader>)ctx.getAttribute("seam.context.classLoader"); - if (ref == null || ref.get() == null) { - log.warn("Failed to bootstrap context classloader. Facelets may not work properly from MDBs"); - } else { - Thread.currentThread().setContextClassLoader(ref.get()); - } - } - - protected void resetContextClassLoader() { - // JBSEAM-3555 Quick fix - if (originalClassLoader != null) { - Thread.currentThread().setContextClassLoader(originalClassLoader); - originalClassLoader = null; - } - } - - public void run() throws IOException - { - try { - init(); - renderFacelet(facesContext, faceletForViewId(viewId)); - } finally { - cleanup(); - resetContextClassLoader(); - } - } - - public String getOutput() - { - return writer.getBuffer().toString(); - } - - /** - * Get a Facelet for a URL - */ - protected Facelet faceletForViewId(String viewId) throws IOException - { - URL url = ResourceLoader.instance().getResource(viewId); - if (url == null) - { - throw new IllegalArgumentException("resource doesn't exist: " + viewId); - } - return ApplicationAssociate.getCurrentInstance().getFaceletFactory().getFacelet(url); - } - - /** - * Render a Facelet - */ - protected void renderFacelet(FacesContext facesContext, Facelet facelet) throws IOException - { - UIViewRoot root = facesContext.getViewRoot(); - facelet.apply(facesContext, root); - JSF.renderChildren(facesContext, root); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/facelet/ServletContextManager.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,58 +0,0 @@ -package org.jboss.seam.ui.facelet; - -import static org.jboss.seam.ScopeType.APPLICATION; - -import javax.servlet.ServletContext; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Unwrap; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.mock.MockServletContext; - -@Name("org.jboss.seam.ui.facelet.mockServletContext") -@Scope(APPLICATION) -@BypassInterceptors -@Install(dependencies="org.jboss.seam.faces.renderer") -@AutoCreate -public class ServletContextManager -{ - - private ServletContext servletContext; - - @Create - public void create() - { - // TODO A bit of a hack, we should store the servlet context properly - if (ServletLifecycle.getCurrentServletContext() != null) - { - servletContext = ServletLifecycle.getCurrentServletContext(); - } - else - { - this.servletContext = new MockServletContext(); - } - } - - @Unwrap - public ServletContext getServletContext() - { - return servletContext; - } - - public static ServletContext instance() - { - if (!Contexts.isApplicationContextActive()) - { - throw new IllegalStateException("Application context is not active"); - } - return (ServletContext) Component.getInstance(ServletContextManager.class, APPLICATION); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/filter/Ajax4jsfFilterInstantiator.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,27 +0,0 @@ -package org.jboss.seam.ui.filter; - -import static org.jboss.seam.annotations.Install.FRAMEWORK; - -import javax.servlet.Filter; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Unwrap; -import org.jboss.seam.annotations.intercept.BypassInterceptors; - -@Name("org.jboss.seam.web.ajax4jsfFilterInstantiator") -@Install(precedence = FRAMEWORK, classDependencies={"org.ajax4jsf.Filter", "org.apache.commons.digester.Digester"}) -@BypassInterceptors -(a)Scope(ScopeType.STATELESS) -public class Ajax4jsfFilterInstantiator -{ - - @Unwrap - public Filter create() - { - return new org.ajax4jsf.Filter(); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,67 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.graphicImage.GraphicImageStore.ImageWrapper; -import org.jboss.seam.ui.util.HTML; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class GraphicImageRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIGraphicImage.class; - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIGraphicImage graphicImage = (UIGraphicImage) component; - - String key = graphicImage.getFileName(); - String extension = null; - - Image image = Image.instance(); - image.setInput(graphicImage.getValue()); - - // Do transforms - - for (UIComponent cmp : graphicImage.getChildren()) - { - if (cmp instanceof ImageTransform) - { - ImageTransform imageTransform = (ImageTransform) cmp; - imageTransform.applyTransform(image); - } - } - - key = GraphicImageStore.instance().put(new ImageWrapper(image.getImage(), image.getContentType()), - key); - extension = image.getContentType().getExtension(); - - writer.startElement(HTML.IMG_ELEM, graphicImage); - if (graphicImage.getId() != null) - { - writer.writeAttribute(HTML.ID_ATTR, graphicImage.getClientId(context), HTML.ID_ATTR); - } - - String url = context.getExternalContext().getRequestContextPath() - + GraphicImageResource.GRAPHIC_IMAGE_RESOURCE_PATH + "/" + key + extension; - writer.writeAttribute(HTML.SRC_ATTR, url, HTML.SRC_ATTR); - HTML.renderHTMLAttributes(writer, component, HTML.IMG_PASSTHROUGH_ATTRIBUTES); - writer.endElement(HTML.IMG_ELEM); - } - - @Override - public boolean getRendersChildren() - { - return true; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageResource.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageResource.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageResource.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,78 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.servlet.ContextualHttpServletRequest; -import org.jboss.seam.ui.graphicImage.GraphicImageStore.ImageWrapper; -import org.jboss.seam.web.AbstractResource; - -/** - * Serves images from the image store - */ -@Scope(APPLICATION) -@Name("org.jboss.seam.ui.graphicImage.graphicImageResource") -@Install(precedence = BUILT_IN) -@BypassInterceptors -public class GraphicImageResource extends AbstractResource -{ - - public static final String GRAPHIC_IMAGE_RESOURCE_PATH = "/seam/resource/graphicImage"; - - private static final String RESOURCE_PATH = "/graphicImage"; - - @Override - public String getResourcePath() - { - return RESOURCE_PATH; - } - - @Override - public void getResource(final HttpServletRequest request, final HttpServletResponse response) - throws ServletException, IOException - { - - new ContextualHttpServletRequest(request) - { - @Override - public void process() throws IOException - { - doWork(request, response); - } - }.run(); - - } - - private void doWork(HttpServletRequest request, HttpServletResponse response) - throws IOException - { - String pathInfo = request.getPathInfo().substring(getResourcePath().length() + 1, - request.getPathInfo().lastIndexOf(".")); - ImageWrapper image = GraphicImageStore.instance().remove(pathInfo); - if (image != null && image.getImage() != null) - { - response.setContentType(image.getContentType().getMimeType()); - response.setStatus(HttpServletResponse.SC_OK); - response.setContentLength(image.getImage().length); - ServletOutputStream os = response.getOutputStream(); - os.write(image.getImage()); - os.flush(); - } - else - { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageStore.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageStore.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/GraphicImageStore.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,108 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import java.io.Serializable; -import java.rmi.server.UID; -import java.util.HashMap; -import java.util.Map; - -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.core.AbstractMutable; -import org.jboss.seam.log.Log; -import org.jboss.seam.log.Logging; - -@Name("org.jboss.seam.ui.graphicImage.graphicImageStore") -(a)Scope(ScopeType.SESSION) -@Install(precedence = Install.BUILT_IN) -@BypassInterceptors -public class GraphicImageStore extends AbstractMutable implements Serializable -{ - private Log log = Logging.getLog(GraphicImageStore.class); - - public static class ImageWrapper implements Serializable - { - - private byte[] image; - - private Image.Type contentType; - - public ImageWrapper(byte[] image, Image.Type contentType) - { - this.image = image; - this.contentType = contentType; - } - - public Image.Type getContentType() - { - return contentType; - } - - public byte[] getImage() - { - return image; - } - } - - private Map<String, ImageWrapper> store = new HashMap<String, ImageWrapper>(); - - /** - * Put a image into the store - * @param image - * @return the key of the image - */ - public String put(ImageWrapper image) - { - return put(image, null); - } - - /** - * Put an image into the store. - * @param image - * @param key The key to use, if null, a key will be generated - * @return The key of the image - */ - public String put(ImageWrapper image, String key) - { - if (key == null) - { - key = "org.jboss.seam.ui.GraphicImageStore." + new UID().toString().replace(":", "-"); - } - store.put(key, image); - setDirty(); - log.debug("Put image into to session with key #0", key); - return key; - } - - public ImageWrapper get(String key) - { - log.debug("Get image into to session with key #0", key); - ImageWrapper image = store.get(key); - return image; - } - - public ImageWrapper remove(String key) - { - log.debug("Get image from session with key #0", key); - ImageWrapper imageWrapper = store.remove(key); - if ( imageWrapper != null ) - { - setDirty(); - } - return imageWrapper; - } - - public boolean contains(String key) - { - return store.containsKey(key); - } - - public static GraphicImageStore instance() - { - return (GraphicImageStore) Component.getInstance(GraphicImageStore.class); - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/Image.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/Image.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/Image.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,495 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.awt.image.ConvolveOp; -import java.awt.image.Kernel; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; -import java.net.URL; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import javax.imageio.ImageIO; -import javax.imageio.ImageReadParam; -import javax.imageio.ImageReader; -import javax.imageio.stream.ImageInputStream; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.ResourceLoader; - -/** - * Image manipulation and interrogation - * - * @author pmuir - * - */ -@Name("org.jboss.seam.graphicImage.image") -@Install(precedence = Install.BUILT_IN) -@BypassInterceptors -public class Image implements Serializable -{ - - public enum Type - { - IMAGE_PNG("image/png", ".png", "PNG"), IMAGE_JPEG("image/jpeg", ".jpg", "JPEG", "image/jpg"), IMAGE_GIF( - "image/gif", ".gif", "GIF"); - - private String mimeType; - - private String extension; - - private String imageFormatName; - - private List<String> alternativeMimeTypes; - - Type(String mimeType, String extension, String imageFormatName, - String... alternativeMimeTypes) - { - this.mimeType = mimeType; - this.extension = extension; - this.alternativeMimeTypes = Arrays.asList(alternativeMimeTypes); - this.imageFormatName = imageFormatName; - } - - public String getMimeType() - { - return mimeType; - } - - public String getExtension() - { - return extension; - } - - public List<String> getAlternativeMimeTypes() - { - return alternativeMimeTypes; - } - - protected String getImageFormatName() - { - return imageFormatName; - } - - public static Type getTypeByMimeType(String mimeType) - { - for (Type type : values()) - { - if (type.getMimeType().equals(mimeType) || type.alternativeMimeTypes.contains(mimeType)) - { - return type; - } - } - return null; - } - - public static Type getTypeByFormatName(String formatName) - { - for (Type type : values()) - { - if (type.getImageFormatName().equalsIgnoreCase(formatName)) - { - return type; - } - } - return null; - } - } - - public static final int PNG_IMAGE_TYPE = BufferedImage.TYPE_INT_ARGB; - - public static final int DEFAULT_IMAGE_TYPE = BufferedImage.TYPE_INT_RGB; - - private static final Type DEFAULT_CONTENT_TYPE = Type.IMAGE_PNG; - - private transient Object input; - - private byte[] output; - - private boolean dirty; - - private Type contentType = DEFAULT_CONTENT_TYPE; - - private transient BufferedImage bufferedImage; - - public Image() - { - } - - /** - * Set the image. This can be one of String (loaded from the classpath), a - * URL, a File, an InputStream or a byte[] - * - * @param value - * @throws IOException - */ - public Image setInput(Object value) throws IOException - { - this.input = value; - readImage(); - return this; - } - - /** - * Get the image as a byte[], any conversions having been applied. Returns null if the - * image could not be read - */ - public byte[] getImage() throws IOException - { - if ((dirty || output == null) && bufferedImage != null) - { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ImageIO.write(bufferedImage, getContentType().getImageFormatName(), outputStream); - output = outputStream.toByteArray(); - } - return output; - } - - /** - * The content type of the output image, by default DEFAULT_CONTENT_TYPE - */ - public Type getContentType() - { - return contentType; - } - - public void setContentType(Type contentType) - { - this.contentType = contentType; - } - - public BufferedImage getBufferedImage() - { - return bufferedImage; - } - - public void setBufferedImage(BufferedImage bufferedImage) - { - this.bufferedImage = bufferedImage; - dirty = true; - } - - /** - * The aspect ratio of the image - */ - public Double getRatio() throws IOException - { - if (bufferedImage == null) - { - return null; - } - // Do the operation with double precision - Double ratio = (double) bufferedImage.getWidth() / (double) bufferedImage.getHeight(); - return ratio; - } - - /** - * Check whether the image is of a given ratio to within a given precision - */ - public Boolean isRatio(double ratio, double precision) throws IOException - { - if (bufferedImage == null) - { - return null; - } - double error = ratio * precision; - return (ratio - error) < getRatio() && getRatio() <= (ratio + error); - } - - /** - * The width of the image - */ - public Integer getWidth() throws IOException - { - if (bufferedImage == null) - { - return null; - } - return bufferedImage.getWidth(); - } - - /** - * The height of the image - */ - public Integer getHeight() throws IOException - { - if (bufferedImage == null) - { - return null; - } - return bufferedImage.getHeight(); - } - - /** - * Alter the ratio of the output image <b>without</b> altering the ratio of - * the input by adding transparent strips. If the image is already of the - * correct ratio (to within the given precision) nothing happens - */ - public Image adjustRatio(double desiredRatio, double precision) throws InterruptedException, - IOException - { - if (bufferedImage == null) - { - return this; - } - if (!isRatio(desiredRatio, precision)) - { - if (getRatio() > desiredRatio) - { - // The image is too wide - add a transparent strip across the - // top/bottom to make the image squarer - double desiredHeight = getRatio() * getHeight() / desiredRatio; - double stripHeight = (desiredHeight - getHeight()) / 2; - BufferedImage newImage = new BufferedImage(getWidth(), - (int) (getHeight() + stripHeight * 2), getImageType()); - Graphics2D graphics2D = createGraphics(newImage); - graphics2D.drawImage(bufferedImage, 0, (int) stripHeight, null); - bufferedImage = newImage; - } - else if (getRatio() < desiredRatio) - { - // The image is too wide - add a transparent strip across the - // top/bottom to make the image squarer - double desiredWidth = getRatio() * getWidth() / desiredRatio; - double stripWidth = (desiredWidth - getWidth()) / 2; - BufferedImage newImage = new BufferedImage((int) (getWidth() + stripWidth * 2), - getHeight(), getImageType()); - Graphics2D graphics2D = createGraphics(newImage); - graphics2D.drawImage(bufferedImage, (int) stripWidth, 0, null); - bufferedImage = newImage; - } - dirty = true; - } - return this; - } - - /** - * Blur the output image using a convolution - */ - public Image blur(int radius) throws IOException { - if (bufferedImage == null) - { - return this; - } - BufferedImage newImage = new BufferedImage(getWidth(), getHeight(), getImageType()); - int blurWidth = ((radius - 1) * 2 + 1); - int pixels = blurWidth * blurWidth; - float weight = 1.0f/ pixels; - float[] elements = new float[pixels]; - - for (int i = 0; i < pixels; i++) { - elements[i] = weight; - } - - Kernel kernel = new Kernel(blurWidth, blurWidth, elements); - ConvolveOp simpleBlur = new ConvolveOp(kernel); - - simpleBlur.filter(bufferedImage, newImage); - bufferedImage = newImage; - dirty = true; - return this; - } - - /** - * Scale the image to the given width - */ - public Image scaleToWidth(int width) throws IOException - { - if (bufferedImage == null) - { - return this; - } - // Always scale, never stretch. We don't care if the requested scaled - // ratio is different from the current - int height = width * getHeight() / getWidth(); - BufferedImage newImage = new BufferedImage(width, height, getImageType()); - Graphics2D graphics2D = createGraphics(newImage); - graphics2D.drawImage(bufferedImage, 0, 0, width, height, null); - bufferedImage = newImage; - dirty = true; - return this; - } - - public Image scaleToFit(int height, int width) - throws IOException - { - float hratio = (float) height/getHeight(); - float wratio = (float) width/getWidth(); - - if (hratio < wratio) { - return scaleToHeight(height); - } else { - return scaleToWidth(width); - } - } - - /** - * Scale the image to the given height - */ - public Image scaleToHeight(int height) throws IOException - { - if (bufferedImage == null) - { - return this; - } - // Always scale, never stretch. We don't care if the requested scaled - // ratio is different from the current - int width = height * getWidth() / getHeight(); - BufferedImage newImage = new BufferedImage(width, height, getImageType()); - Graphics2D graphics2D = createGraphics(newImage); - graphics2D.drawImage(bufferedImage, 0, 0, width, height, null); - bufferedImage = newImage; - dirty = true; - return this; - } - - /** - * Scale the image by the given factor - */ - public Image scale(double factor) throws IOException - { - if (bufferedImage == null) - { - return this; - } - int width = (int) (getWidth() * factor); - int height = (int) (getHeight() * factor); - BufferedImage newImage = new BufferedImage(width, height, getImageType()); - Graphics2D graphics2D = createGraphics(newImage); - graphics2D.drawImage(bufferedImage, 0, 0, width, height, null); - bufferedImage = newImage; - dirty = true; - return this; - } - - /** - * Resize the image to the given width and height, changing the ratio - * if necessary - */ - public Image resize(int width, int height) - { - if (bufferedImage == null) - { - return this; - } - BufferedImage newImage = new BufferedImage(width, height, getImageType()); - Graphics2D graphics2D = createGraphics(newImage); - graphics2D.drawImage(bufferedImage, 0, 0, width, height, null); - bufferedImage = newImage; - dirty = true; - return this; - } - - private void readImage() throws IOException - { - if (input instanceof URL) - { - readImage(((URL) input).openStream()); - } - else if (input instanceof File) - { - readImage(((File) input).toURL().openStream()); - } - else if (input instanceof String) - { - readImage(ResourceLoader.instance().getResourceAsStream((String) input)); - } - else if (input instanceof InputStream) - { - readImage((InputStream) input); - } - else if (input != null && input.getClass().isArray()) - { - if (input.getClass().getComponentType().isAssignableFrom(Byte.TYPE)) - { - byte[] b = (byte[]) input; - readImage(new ByteArrayInputStream(b)); - } - } - } - - /** - * Create Canvas, set some defaults (bg colour, rendering hints) - * - * @param image - */ - private Graphics2D createGraphics(BufferedImage image) - { - if (image == null) - { - return null; - } - Graphics2D graphics2D = image.createGraphics(); - graphics2D.setBackground(new Color(255, 255, 255)); - if (Type.IMAGE_PNG.equals(getContentType())) - { - graphics2D.setComposite(java.awt.AlphaComposite.Src); - } - graphics2D.clearRect(0, 0, image.getWidth(), image.getHeight()); - graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, - RenderingHints.VALUE_INTERPOLATION_BICUBIC); - return graphics2D; - } - - public static Image instance() - { - if (!Contexts.isConversationContextActive()) - { - throw new IllegalStateException("No active conversation scope"); - } - return (Image) Component.getInstance(Image.class); - } - - private void readImage(InputStream inputStream) throws IOException - { - if (inputStream == null) - { - throw new IllegalArgumentException("Image pointed to must exist (input stream must not be null)"); - } - ImageInputStream stream = ImageIO.createImageInputStream(inputStream); - if (stream == null) - { - throw new IllegalArgumentException("Error creating image input stream from image"); - } - - Iterator iter = ImageIO.getImageReaders(stream); - if (!iter.hasNext()) - { - return; - } - - ImageReader reader = (ImageReader) iter.next(); - ImageReadParam param = reader.getDefaultReadParam(); - reader.setInput(stream, true, true); - String type = reader.getFormatName(); - setContentType(Type.getTypeByFormatName(type)); - bufferedImage = reader.read(0, param); - stream.close(); - reader.dispose(); - dirty = true; - inputStream.close(); - } - - private int getImageType() { - if (Type.IMAGE_PNG.equals(getContentType())) - { - return PNG_IMAGE_TYPE; - } - else - { - return DEFAULT_IMAGE_TYPE; - } - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/ImageTransform.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/ImageTransform.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/ImageTransform.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,11 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import java.io.IOException; - - -public interface ImageTransform -{ - public static final String FAMILY = "org.jboss.seam.ui.UIImageTransform"; - - public abstract void applyTransform(Image image) throws IOException; -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UIGraphicImage.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,16 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import javax.faces.component.html.HtmlGraphicImage; - -public abstract class UIGraphicImage extends HtmlGraphicImage -{ - - public static final String FAMILY = "org.jboss.seam.ui.UIGraphicImage"; - - public abstract String getFileName(); - - public abstract void setFileName(String fileName); - - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageBlur.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,26 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import java.io.IOException; - -import javax.faces.component.UIComponentBase; - - -public abstract class UITransformImageBlur extends UIComponentBase implements ImageTransform -{ - - public void applyTransform(Image image) throws IOException - { - if (!isRendered()) - { - return; - } - image.blur(new Integer(getRadius())); - } - - public abstract String getRadius(); - - public abstract void setRadius(String width); - - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageSize.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,70 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import java.io.IOException; - -import javax.faces.component.UIComponentBase; - - -public abstract class UITransformImageSize extends UIComponentBase implements ImageTransform -{ - - public void applyTransform(Image image) throws IOException - { - if (!isRendered()) - { - return; - } - // TODO reduce number of decimal places - if (isMaintainRatio()) - { - if (getWidth() != null && getHeight() != null) - { - throw new UnsupportedOperationException( - "Cannot maintain ratio and specify height and width"); - } - else if (getWidth() != null) - { - image.scaleToWidth(new Integer(getWidth())); - } - else if (getHeight() != null) - { - image.scaleToHeight(new Integer(getHeight())); - } - } - else if (getFactor() != null) - { - if (getWidth() != null || getHeight() != null) - { - throw new UnsupportedOperationException( - "Cannot scale by a factor and specify height and width"); - } - image.scale(getFactor()); - } - else - { - if (getWidth() == null || getHeight() == null) - { - throw new UnsupportedOperationException( - "If not specifying a factor or maintain ratio you must specify width and heigh"); - } - image.resize(new Integer(getWidth()), new Integer(getHeight())); - } - } - - public abstract boolean isMaintainRatio(); - - public abstract void setMaintainRatio(boolean maintainRatio); - - public abstract Integer getWidth(); - - public abstract void setWidth(Integer width); - - public abstract Integer getHeight(); - - public abstract void setHeight(Integer height); - - public abstract Double getFactor(); - - public abstract void setFactor(Double factor); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/graphicImage/UITransformImageType.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,28 +0,0 @@ -package org.jboss.seam.ui.graphicImage; - -import java.io.IOException; - -import javax.faces.component.UIComponentBase; - - -public abstract class UITransformImageType extends UIComponentBase implements ImageTransform -{ - - public void applyTransform(Image image) throws IOException - { - if (!isRendered()) - { - return; - } - Image.Type type = Image.Type.getTypeByMimeType(getContentType()); - if (type != null) - { - image.setContentType(type); - } - } - - public abstract String getContentType(); - - public abstract void setContentType(String width); - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/CommandButtonParameterComponentHandler.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,35 +0,0 @@ -package org.jboss.seam.ui.handler; - -import javax.faces.component.UIComponent; -import javax.faces.component.UIViewRoot; - -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import static org.jboss.seam.ui.util.cdk.RendererBase.getUtils; - -/** - * If user didn't specify id on button, do it for them (we need one rendered) - * - * @author Pete Muir - * - */ -public class CommandButtonParameterComponentHandler extends ComponentHandler -{ - - public CommandButtonParameterComponentHandler(ComponentConfig config) - { - super(config); - } - - @Override - public void onComponentCreated(FaceletContext ctx, UIComponent c, - UIComponent parent) - { - if (getUtils().isCommandButton(parent) && parent.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) - { - parent.setId("seam" + parent.getId()); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/handler/DecorateHandler.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,39 +0,0 @@ -package org.jboss.seam.ui.handler; - -import java.io.IOException; - -import javax.el.ELException; -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; - -public class DecorateHandler extends ComponentHandler -{ - private com.sun.faces.facelets.tag.ui.DecorateHandler delegate; - - public DecorateHandler(ComponentConfig config) - { - super(config); - if ( tag.getAttributes().get("template")!=null ) - { - delegate = new com.sun.faces.facelets.tag.ui.DecorateHandler(config); - } - } - - @Override - public void applyNextHandler(FaceletContext context, UIComponent component) - throws IOException, FacesException, ELException - { - if ( tag.getAttributes().get("template")!=null ) - { - delegate.apply(context, component); - } - else - { - nextHandler.apply(context, component); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/package-info.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/package-info.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/package-info.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,10 +0,0 @@ -/** - * Seam UI - * - */ -@Namespace(value="http://jboss.com/products/seam/ui", prefix="org.jboss.seam.ui") -@AutoCreate -package org.jboss.seam.ui; - -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Namespace; Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ButtonRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,97 +0,0 @@ -package org.jboss.seam.ui.renderkit; - - - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UIButton; -import org.jboss.seam.ui.util.HTML; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class ButtonRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIButton.class; - } - - private String getType(UIButton button) - { - if (button.getImage() == null) { - return "button"; - } else { - return "image"; - } - } - - - private String getOnClick(UIButton button) throws IOException - { - String onclick = button.getOnclick(); - String url = button.getUrl(); - if (onclick == null) - { - onclick = ""; - } - else if (onclick.length() > 0 && !onclick.endsWith(";")) - { - onclick += "; "; - } - if (url != null) - { - onclick += "location.href='" + url + "'; "; - } - onclick += "return false;"; - if (!button.isDisabled()) - { - return onclick; - } - else - { - return null; - } - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIButton button = (UIButton) component; - writer.startElement(HTML.INPUT_ELEM, button); - String onclick = getOnClick(button); - if (!("").equals(onclick) && !button.isDisabled()) - { - writer.writeAttribute(HTML.ONCLICK_ATTR, onclick, HTML.ONCLICK_ATTR); - } - if (button.getId() != null) - { - writer.writeAttribute(HTML.ID_ATTR, button.getClientId(context), HTML.ID_ATTR); - } - HTML.renderHTMLAttributes(writer, button, HTML.BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK); - if (button.getValue() != null) - { - writer.writeAttribute(HTML.VALUE_ATTR, button.getValue(), HTML.VALUE_ATTR); - } - if (button.isDisabled()) - { - writer.writeAttribute(HTML.DISABLED_ATTR, true, HTML.DISABLED_ATTR); - } - writer.writeAttribute(HTML.TYPE_ATTR, getType(button), HTML.TYPE_ATTR); - if (button.getImage() != null) - { - writer.writeAttribute(HTML.SRC_ATTR, button.getImage(), HTML.SRC_ATTR); - } - } - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - writer.endElement(HTML.INPUT_ELEM); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CacheRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,69 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; -import java.io.StringWriter; -import java.util.Calendar; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.ui.component.UICache; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class CacheRendererBase extends RendererBase { - - private static final LogProvider log = Logging.getLogProvider(UICache.class); - - /** - * last time we logged the failure of the cache - */ - private static Calendar lastLog = null; - - @Override - protected Class getComponentClass() - { - return UICache.class; - } - - @Override - protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UICache cache = (UICache) component; - if (cache.isEnabled()) - { - String key = cache.getKey(); - String cachedContent = (String) cache.getCacheProvider().get(cache.getRegion(), key); - if (cachedContent == null) - { - log.debug("rendering from scratch: " + key); - StringWriter stringWriter = new StringWriter(); - ResponseWriter cachingResponseWriter = writer.cloneWithWriter(stringWriter); - context.setResponseWriter(cachingResponseWriter); - renderChildren(context, component); - context.setResponseWriter(writer); - String output = stringWriter.getBuffer().toString(); - writer.write(output); - cache.getCacheProvider().put(cache.getRegion(), key, output); - } - else - { - log.debug("rendering from cache: " + key); - writer.write(cachedContent); - } - } - else - { - renderChildren(context, component); - } - } - - @Override - public boolean getRendersChildren() - { - return true; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/CommandButtonParameterRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,101 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import static org.jboss.seam.ui.util.HTML.SCRIPT_ELEM; -import static org.jboss.seam.ui.util.HTML.SCRIPT_LANGUAGE_ATTR; -import static org.jboss.seam.ui.util.HTML.SCRIPT_LANGUAGE_JAVASCRIPT; -import static org.jboss.seam.ui.util.HTML.SCRIPT_TYPE_ATTR; -import static org.jboss.seam.ui.util.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.component.UIParameter; -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.ui.util.cdk.RendererBase; - -/** - * @author Pete Muir - * - */ -public abstract class CommandButtonParameterRendererBase extends RendererBase -{ - - protected abstract LogProvider getLog(); - - protected abstract String getParameterName(UIComponent component); - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) - throws IOException - { - UIComponent actionComponent = component.getParent(); - UIComponent form = getUtils().getForm(actionComponent); - UIParameter parameter = (UIParameter) component; - if (getUtils().isCommandButton(actionComponent)) - { - String formId = form.getClientId(context); - writer.startElement(SCRIPT_ELEM, component); - writer.writeAttribute(SCRIPT_LANGUAGE_ATTR, SCRIPT_LANGUAGE_JAVASCRIPT, SCRIPT_LANGUAGE_ATTR); - writer.writeAttribute(SCRIPT_TYPE_ATTR, SCRIPT_TYPE_TEXT_JAVASCRIPT, SCRIPT_TYPE_ATTR); - if (actionComponent.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) - { - getLog().warn("Must set an id for the command buttons with s:conversationPropagation"); - } - - - String functionBody = - "{" + - "if (document.getElementById)" + - "{" + - "var form = document.getElementById('" + formId + "');" + - "var input = document.createElement('input');" + - "if (document.all)" + - "{ " + // what follows should work with NN6 but doesn't in M14" - "input.type = 'hidden';" + - "input.name = '" + getParameterName(component) + "';" + - "input.value = '" + parameter.getValue() + "';" + - "}" + - "else if (document.getElementById) " + - "{" + // so here is theNN6 workaround - "input.setAttribute('type', 'hidden');" + - "input.setAttribute('name', '" + getParameterName(component) + "');" + - "input.setAttribute('value', '" + parameter.getValue() + "');" + - "}" + - "form.appendChild(input);" + - "return true;" + - "}" + - "}"; - - String functionName = "cp_" + actionComponent.getId(); - - String functionCode = - "var " + functionName + " = " + - "new Function(\"event\", \"" + functionBody + "\");"; - - writer.write(functionCode); - - // We are either written before the HTML element (e.g. a:commandButton) - // In this case we can simply prepend to the existing onClick - - String existingOnClick = (String) actionComponent.getAttributes().get("onclick"); - - actionComponent.getAttributes().put("onclick", functionName + "();" + existingOnClick); - - // But we also might be written after (e.g. JSF RI h:commandButton - // In this case we can use event capture - - String functionRegister = - "if (document.getElementById('" + actionComponent.getClientId(context) + "'))" + - "{" + - "document.getElementById('" + actionComponent.getClientId(context) + "').onclick = new Function(\"event\", \"" + functionBody + "\");" + - "}"; - writer.write(functionRegister); - writer.endElement("script"); - } - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationNameRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,37 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import javax.faces.component.UIComponent; - -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.ui.component.UIConversationName; - -/** - * @author Pete Muir - * - */ -public class ConversationNameRendererBase extends CommandButtonParameterRendererBase -{ - - private static LogProvider log = Logging.getLogProvider(ConversationNameRendererBase.class); - - - @Override - protected LogProvider getLog() - { - return log; - } - - @Override - protected String getParameterName(UIComponent component) - { - return ((UIConversationName) component).getName(); - } - - @Override - protected Class getComponentClass() - { - return UIConversationName.class; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ConversationPropagationRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,38 +0,0 @@ -package org.jboss.seam.ui.renderkit; - - - - -import javax.faces.component.UIComponent; - -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.ui.component.UIConversationPropagation; - -/** - * @author Pete Muir - * - */ -public class ConversationPropagationRendererBase extends CommandButtonParameterRendererBase -{ - - private static LogProvider log = Logging.getLogProvider(ConversationPropagationRendererBase.class); - - @Override - protected Class getComponentClass() - { - return UIConversationPropagation.class; - } - - @Override - protected LogProvider getLog() - { - return log; - } - - @Override - protected String getParameterName(UIComponent component) - { - return ((UIConversationPropagation) component).getName(); - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DecorateRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,173 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.ui.component.UIDecorate; -import org.jboss.seam.ui.util.Decoration; -import org.jboss.seam.ui.util.HTML; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class DecorateRendererBase extends RendererBase -{ - // Place the attributes you want to store away - private Map<String, Object> originalValues = new HashMap(); - // The list of attributes in the event scope to store away - String[] storeOriginals = new String[] {"invalid", "required"}; - - @Override - protected Class getComponentClass() - { - return UIDecorate.class; - } - - /** - * Store away the attribute from the event context (if it is set) - * - * @param names The list of context keys to store away - * @param context The context to target - */ - private void storeOriginalValues(String[] names, Context context) - { - for (String name : names) - { - if (context.isSet(name)) - { - originalValues.put(name, context.get(name)); - } - } - } - - /** - * Restores the state of the event context. If the value is stored away, it is restored - * It it was not in the map, it was not in the context in the first place so clean - * up what we have placed there during this run. - * - * @param names The list of context keys to restore - * @param context The context to target - */ - private void restoreOriginalValues(String[] names, Context context) { - for (String name : names) { - if (originalValues.containsKey(name)) { - context.set(name, originalValues.get(name)); - } else { - context.remove(name); - } - } - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIDecorate decorate = (UIDecorate) component; - - storeOriginalValues(storeOriginals, Contexts.getEventContext()); - - Contexts.getEventContext().set("invalid", Decoration.hasMessage(decorate, context)); - Contexts.getEventContext().set("required", Decoration.hasRequired(component, context)); - - boolean hasMessage = decorate.hasMessage(); - - if (decorate.isEnclose()) - { - writer.startElement(decorate.getElement(), decorate); - if (decorate.getStyleClass() != null) - { - writer.writeAttribute(HTML.CLASS_ATTR, decorate.getStyleClass(), HTML.CLASS_ATTR); - } - if (decorate.getStyle() != null) - { - writer.writeAttribute(HTML.STYLE_ATTR, decorate.getStyle(), HTML.STYLE_ATTR); - } - writer.writeAttribute("id", decorate.getClientId(context), "id"); - } - - UIComponent aroundDecoration = decorate.getDecoration("aroundField"); - UIComponent aroundInvalidDecoration = decorate.getDecoration("aroundInvalidField"); - if (aroundDecoration != null && !hasMessage) - { - aroundDecoration.setParent(decorate); - aroundDecoration.encodeBegin(context); - } - if (aroundInvalidDecoration != null && hasMessage) - { - aroundInvalidDecoration.setParent(decorate); - aroundInvalidDecoration.encodeBegin(context); - } - } - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIDecorate decorate = (UIDecorate) component; - - boolean hasMessage = decorate.hasMessage(); - UIComponent aroundDecoration = decorate.getDecoration("aroundField"); - UIComponent aroundInvalidDecoration = decorate.getDecoration("aroundInvalidField"); - if (aroundDecoration != null && !hasMessage) - { - aroundDecoration.setParent(decorate); - aroundDecoration.encodeEnd(context); - } - if (aroundInvalidDecoration != null && hasMessage) - { - aroundInvalidDecoration.setParent(decorate); - aroundInvalidDecoration.encodeEnd(context); - } - if (decorate.isEnclose()) - { - context.getResponseWriter().endElement(decorate.getElement()); - } - - restoreOriginalValues(storeOriginals, Contexts.getEventContext()); - } - - @Override - protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIDecorate decorate = (UIDecorate) component; - - boolean hasMessage = decorate.hasMessage(); - - UIComponent beforeDecoration = decorate.getDecoration("beforeField"); - UIComponent beforeInvalidDecoration = decorate.getDecoration("beforeInvalidField"); - if (beforeDecoration != null && !hasMessage) - { - beforeDecoration.setParent(decorate); - renderChild(context, beforeDecoration); - } - if (beforeInvalidDecoration != null && hasMessage) - { - beforeInvalidDecoration.setParent(decorate); - renderChild(context, beforeInvalidDecoration); - } - - renderChildren(context, decorate); - - UIComponent afterDecoration = decorate.getDecoration("afterField"); - UIComponent afterInvalidDecoration = decorate.getDecoration("afterInvalidField"); - if (afterDecoration != null && !hasMessage) - { - afterDecoration.setParent(decorate); - renderChild(context, afterDecoration); - } - if (afterInvalidDecoration != null && hasMessage) - { - afterInvalidDecoration.setParent(decorate); - renderChild(context, afterInvalidDecoration); - } - } - - @Override - public boolean getRendersChildren() - { - return true; - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DefaultActionRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,86 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import static org.jboss.seam.ui.util.HTML.SCRIPT_ELEM; -import static org.jboss.seam.ui.util.HTML.SCRIPT_LANGUAGE_ATTR; -import static org.jboss.seam.ui.util.HTML.SCRIPT_LANGUAGE_JAVASCRIPT; -import static org.jboss.seam.ui.util.HTML.SCRIPT_TYPE_ATTR; -import static org.jboss.seam.ui.util.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.component.UIOutput; -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.ui.util.cdk.RendererBase; - -/** - * @author Pete Muir - * @author sim - * - */ -public class DefaultActionRendererBase extends RendererBase -{ - - public static final String MARK = "org.jboss.seam.ui.DefaultAction"; - - private static LogProvider log = Logging.getLogProvider(DefaultActionRendererBase.class); - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, - UIComponent component) throws IOException - { - UIComponent actionComponent = component.getParent(); - String actionComponentId = actionComponent.getClientId(context); - UIComponent form = getUtils().getForm(actionComponent); - if (form == null) - { - log.warn("Must embed default action inside a form"); - } - else - { - String formId = form.getClientId(context); - writer.startElement(SCRIPT_ELEM, component); - writer.writeAttribute(SCRIPT_LANGUAGE_ATTR, SCRIPT_LANGUAGE_JAVASCRIPT, SCRIPT_LANGUAGE_ATTR); - writer.writeAttribute(SCRIPT_TYPE_ATTR, SCRIPT_TYPE_TEXT_JAVASCRIPT, SCRIPT_TYPE_ATTR); - if (actionComponent.getId().startsWith(UIViewRoot.UNIQUE_ID_PREFIX)) - { - log.warn("Must set an id for the default action source"); - } - if (form.getAttributes().containsKey(MARK)) - { - if (!form.getAttributes().get(MARK).equals(component.getClientId(context))) - { - log.warn("Can only specify one default action per form"); - } - } - else - { - form.getAttributes().put(MARK, component.getClientId(context)); - } - String functionBody = - "{var keycode;" + - "if (window.event) keycode = window.event.keyCode;" + - "else if (event) keycode = event.which;" + - "else return true;" + - "if (keycode == 13) " + - "{ document.getElementById('" + actionComponentId + "').click();return false; } " + - "else return true; }"; - String functionCode = - "document.forms['" + formId + "'].onkeypress = " + - "new Function(\"event\", \"" + functionBody + "\");"; - writer.write(functionCode); - writer.endElement("script"); - } - } - - @Override - protected Class getComponentClass() - { - return UIOutput.class; - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DivRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,30 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UIStyle; - -public class DivRendererBase extends StyleRendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIStyle.class; - } - - @Override - public void endElement(ResponseWriter writer) throws IOException - { - writer.endElement("div"); - } - - @Override - public void startElement(ResponseWriter writer, UIStyle style) throws IOException - { - writer.startElement("div", style); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/DownloadRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,81 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; - -import org.jboss.seam.ui.component.UIDownload; -import org.jboss.seam.ui.component.UIResource; -import org.jboss.seam.ui.util.HTML; -import org.jboss.seam.ui.util.ViewUrlBuilder; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class DownloadRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIDownload.class; - } - - @Override - protected void doEncodeBegin(javax.faces.context.ResponseWriter writer, FacesContext ctx, UIComponent component) throws IOException - { - UIDownload download = (UIDownload) component; - - if (!download.isRendered()) - return; - - if (download.getSrc() != null) - { - - ViewUrlBuilder builder = new ViewUrlBuilder(download.getSrc(), null); - - for (Object child : download.getChildren()) - { - if (child instanceof UIParameter) - { - builder.addParameter((UIParameter) child); - } - - } - writeStartTag(writer, download, builder.getEncodedUrl()); - renderNonResourceChildren(ctx, download); - writer.endElement(HTML.ANCHOR_ELEM); - - } - - } - - private void renderNonResourceChildren(FacesContext ctx, UIComponent component) throws IOException - { - for (Object child : component.getChildren()) - { - if (!(child instanceof UIParameter) && !(child instanceof UIResource) && (child instanceof UIComponent)) - { - renderChild(ctx, (UIComponent) child); - } - - } - } - - private void writeStartTag(javax.faces.context.ResponseWriter writer, UIDownload download, String url) throws IOException - { - writer.startElement(HTML.ANCHOR_ELEM, null); - writer.writeAttribute(HTML.HREF_ATTR, url, null); - if (download.getStyle() != null) - writer.writeAttribute(HTML.STYLE_ATTR, download.getStyle(), null); - if (download.getStyleClass() != null) - writer.writeAttribute(HTML.STYLE_CLASS_ATTR, download.getStyleClass(), null); - } - - @Override - public boolean getRendersChildren() - { - return true; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/EqualityValidatorRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,70 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.validator.Validator; - -import org.jboss.seam.ui.component.UIEqualityValidator; -import org.jboss.seam.ui.util.cdk.RendererBase; -import org.jboss.seam.ui.validator.EqualityValidator; - -/** - * This class mainly does some validation "hook-in" - * - * @author Daniel Roth - * - */ -public class EqualityValidatorRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIEqualityValidator.class; - } - - @Override - protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIEqualityValidator ev = (UIEqualityValidator) component; - EditableValueHolder evh = null; - if (ev != null && ev.getParent() instanceof EditableValueHolder) - { - evh = (EditableValueHolder) ev.getParent(); - } - - if (evh == null) - throw new IllegalArgumentException("validateEquality tag must be nested in an EditableValueHolder (\"input tag\")"); - - if (!hasEqualityValidator(evh)) - { - evh.addValidator(new EqualityValidator(ev.getFor(), ev.getMessage(), ev.getMessageId(), ev.getOperator())); - evh.setRequired(ev.isRequired()); - } - - renderChildren(context, component); - } - - private boolean hasEqualityValidator(EditableValueHolder evh) - { - for (Validator validator : evh.getValidators()) - { - if (validator instanceof EqualityValidator) - { - return true; - } - } - return false; - } - - @Override - public boolean getRendersChildren() - { - return true; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,134 +0,0 @@ -package org.jboss.seam.ui.renderkit; - - -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.servlet.ServletRequest; - -import org.jboss.seam.ui.component.UIFileUpload; -import org.jboss.seam.ui.util.HTML; -import org.jboss.seam.ui.util.cdk.RendererBase; -import org.jboss.seam.web.MultipartRequest; - -public class FileUploadRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIFileUpload.class; - } - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIFileUpload fileUpload = (UIFileUpload) component; - - writer.startElement(HTML.INPUT_ELEM, fileUpload); - writer.writeAttribute(HTML.TYPE_ATTR, HTML.FILE_ATTR, null); - - String clientId = fileUpload.getClientId(context); - writer.writeAttribute(HTML.ID_ATTR, clientId, null); - writer.writeAttribute(HTML.NAME_ATTR, clientId, null); - - - /*if (fileUpload.getAccept() != null) - { - writer.writeAttribute(HTML.ACCEPT_ATTR, fileUpload.getAccept(), "accept"); - } - - if (fileUpload.getStyleClass() != null) - { - writer.writeAttribute(HTML.CLASS_ATTR, fileUpload.getStyleClass(), JSF.STYLE_CLASS_ATTR); - } - - if (fileUpload.getStyle() != null) - { - writer.writeAttribute(HTML.STYLE_ATTR, fileUpload.getStyle(), "style"); - }*/ - - HTML.renderHTMLAttributes(writer, component, HTML.INPUT_FILE_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED); - - - writer.endElement(HTML.INPUT_ELEM); - } - - @Override - protected void doDecode(FacesContext context, UIComponent component) - { - UIFileUpload fileUpload = (UIFileUpload) component; - ServletRequest request = (ServletRequest) context.getExternalContext().getRequest(); - - if (!(request instanceof MultipartRequest)) - { - request = unwrapMultipartRequest(request); - } - - if (request instanceof MultipartRequest) - { - MultipartRequest multipartRequest = (MultipartRequest) request; - - String clientId = component.getClientId(context); - fileUpload.setLocalInputStream(multipartRequest.getFileInputStream(clientId)); - fileUpload.setLocalContentType(multipartRequest.getFileContentType(clientId)); - fileUpload.setLocalFileName(multipartRequest.getFileName(clientId)); - fileUpload.setLocalFileSize(multipartRequest.getFileSize(clientId)); - } - } - - /** - * Finds an instance of MultipartRequest wrapped within a request or its - * (recursively) wrapped requests. - */ - private static ServletRequest unwrapMultipartRequest(ServletRequest request) - { - while (!(request instanceof MultipartRequest)) - { - boolean found = false; - - for (Method m : request.getClass().getMethods()) - { - if (ServletRequest.class.isAssignableFrom(m.getReturnType()) - && m.getParameterTypes().length == 0) - { - try - { - request = (ServletRequest) m.invoke(request); - found = true; - break; - } - catch (Exception ex) - { /* Ignore, try the next one */ - } - } - } - - if (!found) - { - for (Field f : request.getClass().getDeclaredFields()) - { - if (ServletRequest.class.isAssignableFrom(f.getType())) - { - try - { - request = (ServletRequest) f.get(request); - } - catch (Exception ex) - { /* Ignore */ - } - } - } - } - - if (!found) break; - } - - return request; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FormattedTextRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,30 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UIFormattedText; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class FormattedTextRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIFormattedText.class; - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - String formattedText = ((UIFormattedText) component).getFormattedText(); - if (formattedText != null) - { - writer.write(formattedText); - } - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/FragmentRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,32 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UIFragment; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class FragmentRendererBase extends RendererBase -{ - @Override - protected Class getComponentClass() - { - return UIFragment.class; - } - - @Override - public boolean getRendersChildren() - { - return true; - } - - @Override - protected void doEncodeChildren(ResponseWriter writer, FacesContext facesContext, UIComponent component) throws IOException - { - renderChildren(facesContext, component); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/LinkRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,50 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UILink; -import org.jboss.seam.ui.util.HTML; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class LinkRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UILink.class; - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UILink link = (UILink) component; - String url = link.getUrl(); - writer.startElement(HTML.ANCHOR_ELEM, link); - if (url != null && !link.isDisabled()) - { - writer.writeAttribute(HTML.HREF_ATTR, url, HTML.HREF_ATTR); - } - if (link.getId() != null) - { - writer.writeAttribute(HTML.ID_ATTR, link.getClientId(context), HTML.ID_ATTR); - } - HTML.renderHTMLAttributes(writer, link, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES); - if (link.getValue() != null) - { - writer.writeText(link.getValue(), null); - } - } - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - writer.endElement(HTML.ANCHOR_ELEM); - } - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/RemoteRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,65 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; -import java.util.Map; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UIRemote; -import org.jboss.seam.ui.util.cdk.RendererBase; - -/** - * Renderer for rendering the required <script> tags for Seam Remoting - * - * @author Shane Bryzak - */ -public class RemoteRendererBase extends RendererBase -{ - @Override - protected Class getComponentClass() - { - return UIRemote.class; - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) - throws IOException - { - UIRemote remote = (UIRemote) component; - - writeScript(context, remote); - } - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) - throws IOException - { - writer.flush(); - } - - public void writeScript(FacesContext context, UIRemote remote) - throws IOException - { - ResponseWriter response = context.getResponseWriter(); - - Map request = context.getExternalContext().getRequestMap(); - if (!request.containsKey("REMOTE_SCRIPT")) - { - response.startElement("script", null); - response.writeAttribute("type", "text/javascript", null); - response.writeAttribute("src", context.getExternalContext().getRequestContextPath() - + "/seam/resource/remoting/resource/remote.js", null); - response.endElement("script"); - request.put("REMOTE_SCRIPT", true); - } - - response.startElement("script", null); - response.writeAttribute("type", "text/javascript", null); - response.writeAttribute("src", context.getExternalContext().getRequestContextPath() - + "/seam/resource/remoting/interface.js?" + - remote.getInclude().replace(',', '&'), null); - response.endElement("script"); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ResourceRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,35 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - -import org.jboss.seam.ui.DocumentStoreUtils; -import org.jboss.seam.ui.component.UIResource; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public class ResourceRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIResource.class; - } - - @Override - protected void doEncodeBegin(javax.faces.context.ResponseWriter writer, FacesContext ctx, UIComponent component) throws IOException - { - - UIResource resource = (UIResource) component; - - String url = DocumentStoreUtils.addResourceToDataStore(ctx, resource); - - ctx.getExternalContext().redirect(url); - - } - - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/SpanRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,58 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UISpan; -import org.jboss.seam.ui.component.UIStyle; - -public class SpanRendererBase extends StyleRendererBase -{ - - @Override - protected Class getComponentClass() - { - return UISpan.class; - } - - @Override - public void endElement(ResponseWriter writer) throws IOException - { - writer.endElement("span"); - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UISpan span = (UISpan) component; - - startElement(writer, span); - - writer.writeAttribute("id", component.getClientId(context), "id"); - - if (span.getStyleClass() != null) - { - writer.writeAttribute("class", span.getStyleClass(), "styleClass"); - } - - if (span.getStyle() != null) - { - writer.writeAttribute("style", span.getStyle(), "style"); - } - - if (span.getTitle() != null) - { - writer.writeAttribute("title", span.getTitle(), "title"); - } - } - - @Override - public void startElement(ResponseWriter writer, UIStyle style) throws IOException - { - writer.startElement("span", style); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/StyleRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/StyleRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/StyleRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,45 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UIStyle; -import org.jboss.seam.ui.util.cdk.RendererBase; - -public abstract class StyleRendererBase extends RendererBase -{ - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIStyle style = (UIStyle) component; - - startElement(writer, style); - - writer.writeAttribute("id", component.getClientId(context), "id"); - - if (style.getStyleClass() != null) - { - writer.writeAttribute("class", style.getStyleClass(), "styleClass"); - } - - if (style.getStyle() != null) - { - writer.writeAttribute("style", style.getStyle(), "style"); - } - } - - @Override - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - endElement(writer); - } - - - public abstract void startElement(ResponseWriter writer, UIStyle style) throws IOException; - public abstract void endElement(ResponseWriter writer) throws IOException; - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/TokenRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,210 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -import javax.faces.component.UIComponent; -import javax.faces.component.UIForm; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.servlet.http.HttpSession; - -import org.jboss.seam.ui.RenderStampStore; -import org.jboss.seam.ui.UnauthorizedCommandException; -import org.jboss.seam.ui.component.UIToken; -import org.jboss.seam.ui.util.HTML; -import org.jboss.seam.ui.util.cdk.RendererBase; -import org.jboss.seam.util.Base64; -import org.jboss.seam.util.RandomStringUtils; - -/** - * <p> - * The <strong>TokenRendererBase</strong> renders the form's signature as a - * hidden form field for the UIToken component. If the renderStampStore - * component is enabled, the actually signature will be stored in the session - * and the key to this token store in the hidden form field, providing the same - * guarantee for client-side state saving as with server-side state saving. - * </p> - * - * <p> - * The form signature is calculated as follows: - * </p> - * - * <pre> - * sha1(signature = contextPath + viewId + "," + formClientId + random alphanum, salt = clientUid) - * </pre> - * - * <p> - * The developer can also choose to incorporate the session id into this hash to - * generate a more secure token (at the cost of binding it to the session) by - * setting the requireSession attribute to true. Then the calculation becomes: - * </p> - * - * <pre> - * sha1(signature = contextPath + viewId + "," + formClientId + "," + random alphanum + sessionId, salt = clientUid) - * </pre> - * - * <p> - * The decode method performs the following steps: - * </p> - * <ol> - * <li>Check if this is a postback, otherwise skip the check</li> - * <li>Check that this form was the one that was submitted, otherwise skip the - * check</li> - * <li>Get the unique client identifier (from cookie), otherwise throw an - * exception that the browser must have unique identifier</li> - * <li>Get the javax.faces.FormSignature request parameter, otherwise throw an - * exception that the form signature is missing</li> - * <li>If the renderStampStore component is enabled, retrieve the render stamp - * from the store using the key stored in the render stamp attribute of the form.</li> - * <li>Generate the hash as before and verify that it equals the value of the - * javax.faces.FormSignature request parameter, otherwise throw an exception</li> - * </ol> - * - * <p> - * If all of that passes, we are okay to process the form (advance to validate - * phase as decode() is called in apply request values). - * </p> - * - * @author Dan Allen - * @author Stuart Douglas - * @see UnauthorizedCommandException - */ -public class TokenRendererBase extends RendererBase -{ - public static final String FORM_SIGNATURE_PARAM = "javax.faces.FormSignature"; - - public static final String RENDER_STAMP_ATTR = "javax.faces.RenderStamp"; - - private static final String COOKIE_CHECK_SCRIPT_KEY = "org.jboss.seam.ui.COOKIE_CHECK_SCRIPT"; - - @Override - protected Class getComponentClass() - { - return UIToken.class; - } - - @Override - protected void doDecode(FacesContext context, UIComponent component) - { - UIToken token = (UIToken) component; - UIForm form = token.getParentForm(); - if (context.getRenderKit().getResponseStateManager().isPostback(context) && form.isSubmitted()) - { - String clientToken = token.getClientUid(); - String viewId = context.getViewRoot().getViewId(); - if (clientToken == null) - { - throw new UnauthorizedCommandException(viewId, "No client identifier provided"); - } - - String requestedViewSig = context.getExternalContext().getRequestParameterMap().get(FORM_SIGNATURE_PARAM); - if (requestedViewSig == null) - { - throw new UnauthorizedCommandException(viewId, "No form signature provided"); - } - - if (!requestedViewSig.equals(generateViewSignature(context, form, !token.isAllowMultiplePosts(), token.isRequireSession(), clientToken))) - { - throw new UnauthorizedCommandException(viewId, "Form signature invalid"); - } - RenderStampStore store = RenderStampStore.instance(); - if (store != null) - { - // remove the key from the store if we are using it - store.removeStamp(String.valueOf(form.getAttributes().get(RENDER_STAMP_ATTR))); - } - form.getAttributes().remove(RENDER_STAMP_ATTR); - } - } - - @Override - protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIToken token = (UIToken) component; - UIForm form = token.getParentForm(); - if (form == null) - { - throw new IllegalStateException("UIToken must be inside a UIForm."); - } - - String renderStamp = RandomStringUtils.randomAlphanumeric(50); - RenderStampStore store = RenderStampStore.instance(); - if (store != null) - { - // if the store is not null we store the key - // instead of the actual stamp; this puts the - // server in control of this value rather than - // the component tree, which is owned by the client - // when using client-side state saving - renderStamp = store.storeStamp(renderStamp); - } - - writeCookieCheckScript(context, writer, token); - - token.getClientUidSelector().seed(); - form.getAttributes().put(RENDER_STAMP_ATTR, renderStamp); - writer.startElement(HTML.INPUT_ELEM, component); - writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, HTML.TYPE_ATTR); - writer.writeAttribute(HTML.NAME_ATTR, FORM_SIGNATURE_PARAM, HTML.NAME_ATTR); - writer.writeAttribute(HTML.VALUE_ATTR, generateViewSignature(context, form, !token.isAllowMultiplePosts(), token.isRequireSession(), token.getClientUidSelector().getClientUid()), HTML.VALUE_ATTR); - writer.endElement(HTML.INPUT_ELEM); - } - - /** - * If the client has not already delivered us a cookie and the cookie notice is enabled, write out JavaScript that will show the user - * an alert if cookies are not enabled. - */ - private void writeCookieCheckScript(FacesContext context, ResponseWriter writer, UIToken token) throws IOException - { - if (!token.getClientUidSelector().isSet() && token.isEnableCookieNotice() && !context.getExternalContext().getRequestMap().containsKey(COOKIE_CHECK_SCRIPT_KEY)) { - writer.startElement(HTML.SCRIPT_ELEM, token); - writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", HTML.TYPE_ATTR); - writer.write("if (!document.cookie) {" + - " alert('This website uses a security measure that requires cookies to be enabled in your browser. Since you have cookies disabled, you will not be permitted to submit a form.');" + - " }"); - writer.endElement(HTML.SCRIPT_ELEM); - context.getExternalContext().getRequestMap().put(COOKIE_CHECK_SCRIPT_KEY, true); - } - } - - private String generateViewSignature(FacesContext context, UIForm form, boolean useRenderStamp, boolean useSessionId, String saltPhrase) - { - String rawViewSignature = context.getExternalContext().getRequestContextPath() + "," + context.getViewRoot().getViewId() + "," + form.getClientId(context); - if (useRenderStamp) - { - String renderStamp = form.getAttributes().get(RENDER_STAMP_ATTR).toString(); - RenderStampStore store = RenderStampStore.instance(); - if (store != null) - { - // if we are using the RenderStampStore the key to access the render - // stamp - // is stored in the view root instead of the actual render stamp - renderStamp = store.getStamp(renderStamp); - } - rawViewSignature += "," + renderStamp; - } - if (useSessionId) - { - rawViewSignature += "," + ((HttpSession) context.getExternalContext().getSession(true)).getId(); - } - try - { - MessageDigest digest = MessageDigest.getInstance("SHA-1"); - digest.update(saltPhrase.getBytes()); - byte[] salt = digest.digest(); - digest.reset(); - digest.update(rawViewSignature.getBytes()); - digest.update(salt); - byte[] raw = digest.digest(); - return Base64.encodeBytes(raw); - } - catch (NoSuchAlgorithmException ex) - { - ex.printStackTrace(); - return null; - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/renderkit/ValidateAllRendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,59 +0,0 @@ -package org.jboss.seam.ui.renderkit; - -import java.io.IOException; -import java.util.List; - -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; - -import org.jboss.seam.ui.component.UIValidateAll; -import org.jboss.seam.ui.util.cdk.RendererBase; -import org.jboss.seam.ui.validator.ModelValidator; - -public class ValidateAllRendererBase extends RendererBase -{ - - @Override - protected Class getComponentClass() - { - return UIValidateAll.class; - } - - @Override - protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException - { - UIValidateAll validateAll = (UIValidateAll) component; - if (!validateAll.isValidatorsAdded()) - { - addValidators(validateAll.getChildren()); - validateAll.setValidatorsAdded(true); - } - renderChildren(context, component); - } - - private void addValidators(List children) - { - for (Object child: children) - { - if (child instanceof EditableValueHolder) - { - EditableValueHolder evh = (EditableValueHolder) child; - if ( evh.getValidators().length==0 ) - { - evh.addValidator( new ModelValidator() ); - } - } - addValidators( ( (UIComponent) child ).getChildren() ); - } - } - - @Override - public boolean getRendersChildren() - { - return true; - } - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/resource/WebResource.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/resource/WebResource.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/resource/WebResource.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,61 +0,0 @@ -package org.jboss.seam.ui.resource; - -import static org.jboss.seam.ScopeType.APPLICATION; -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.io.IOException; -import java.io.InputStream; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.util.Resources; -import org.jboss.seam.web.AbstractResource; - -@Scope(APPLICATION) -@Name("org.jboss.seam.ui.resource.webResource") -@Install(precedence = BUILT_IN) -@BypassInterceptors -public class WebResource extends AbstractResource -{ - public static final String WEB_RESOURCE_PATH = "/seam/resource/web"; - - private static final String RESOURCE_PATH = "/web"; - - @Override - public String getResourcePath() - { - return RESOURCE_PATH; - } - - @Override - public void getResource(HttpServletRequest request, HttpServletResponse response) - throws IOException - { - String pathInfo = request.getPathInfo().substring(getResourcePath().length()); - - InputStream in = Resources.getResourceAsStream( "/org/jboss/seam/ui/resource" + pathInfo, getServletContext() ); - - try { - if (in != null) { - byte[] buffer = new byte[1024]; - int read = in.read(buffer); - while (read != -1) { - response.getOutputStream().write(buffer, 0, read); - read = in.read(buffer); - } - response.getOutputStream().flush(); - } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND); - } - } finally { - Resources.closeStream(in); - } - } - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Decoration.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Decoration.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Decoration.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,93 +0,0 @@ -package org.jboss.seam.ui.util; - -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - - -public class Decoration -{ - - public static boolean hasMessage(UIComponent component, FacesContext context) - { - - // If the component isn't to be rendered, then ignore - if ( !component.isRendered() ) return false; - - - if ( component instanceof EditableValueHolder ) - { - - // If the component has failed validation, then it's invalid - if ( ! ( (EditableValueHolder) component ).isValid() ) return true; - - // If the component has a faces message attached, return true. - // TODO enhance this to only consider ERROR and WARN messages probably - if ( context.getMessages( component.getClientId(context) ).hasNext() ) return true; //TODO: put this outside the if??? - } - - for ( Object child: component.getChildren() ) - { - if (child instanceof UIComponent) - { - boolean message = hasMessage( (UIComponent) child, context ); - if (message) return true; - } - } - return false; - } - - public static boolean hasRequired(UIComponent component, FacesContext context) - { - if ( !component.isRendered() ) return false; - - if ( component instanceof EditableValueHolder ) - { - if ( ( (EditableValueHolder) component ).isRequired() ) return true; - } - - for (Object child: component.getChildren()) - { - if (child instanceof UIComponent) - { - boolean required = hasRequired( (UIComponent) child, context ); - if (required) return true; - } - } - return false; - } - - /** - * A depth-first search for an EditableValueHolder - */ - public static UIComponent getEditableValueHolder(UIComponent component) - { - for (Object child: component.getChildren()) - { - if (child instanceof EditableValueHolder) - { - UIComponent evh =(UIComponent) child; - if ( evh.isRendered() ) - { - return evh; - } - } - else if (child instanceof UIComponent) - { - UIComponent evh = getEditableValueHolder( (UIComponent) child ); - if (evh!=null) return evh; - } - } - return null; - } - - public static UIComponent getDecoration(String name, UIComponent component) - { - UIComponent dec = component.getFacet(name); - if (dec!=null) return dec; - if ( component.getParent()==null ) return null; - return getDecoration( name, component.getParent() ); - } - - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Faces.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Faces.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/Faces.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,22 +0,0 @@ -package org.jboss.seam.ui.util; - -import javax.faces.FacesException; -import javax.faces.application.ViewHandler; -import javax.faces.context.FacesContext; -import javax.servlet.ServletContext; - -public class Faces -{ - - public static String getDefaultSuffix(ServletContext servletContext) throws FacesException - { - String viewSuffix = servletContext.getInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME); - return (viewSuffix != null) ? viewSuffix : ViewHandler.DEFAULT_SUFFIX; - } - - public static String getDefaultSuffix(FacesContext context) throws FacesException { - String viewSuffix = context.getExternalContext().getInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME); - return (viewSuffix != null) ? viewSuffix : ViewHandler.DEFAULT_SUFFIX; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/HTML.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/HTML.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/HTML.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,545 +0,0 @@ -/* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.seam.ui.util; -import java.io.IOException; -import javax.faces.component.UIComponent; -import javax.faces.context.ResponseWriter; -/** - * Constant declarations for HTML rendering. - * @author Manfred Geiler - * @author Anton Koinov - * @version $Revision: 5294 $ $Date: 2007-06-19 23:57:50 +0200 (Út, 19 VI 2007) $ - */ -public final class HTML -{ - - private static String[] concat(String[]... x) - { - int len = 0; - for (String[] y: x) len+=y.length; - String[] result = new String[len]; - int i=0; - for (String[] y: x) - { - for (String s: y) - { - result[i++] = s; - } - } - return result; - } - /** - * @return true, if an attribute was written - * @throws java.io.IOException - */ - public static boolean renderHTMLAttributes(ResponseWriter writer, - UIComponent component, String[] attributes) throws IOException { - boolean somethingDone = false; - for (int i = 0, len = attributes.length; i < len; i++) { - String attrName = attributes[i]; - if (renderHTMLAttribute(writer, component, attrName, attrName)) { - somethingDone = true; - } - } - return somethingDone; - } - /** - * @return true, if the attribute was written - * @throws java.io.IOException - */ - public static boolean renderHTMLAttribute(ResponseWriter writer, - UIComponent component, String componentProperty, String htmlAttrName) - throws IOException { - Object value = component.getAttributes().get(componentProperty); - return renderHTMLAttribute(writer, componentProperty, htmlAttrName, - value); - } - /** - * @return true, if the attribute was written - * @throws java.io.IOException - */ - public static boolean renderHTMLAttribute(ResponseWriter writer, - String componentProperty, String attrName, Object value) - throws IOException { - if (!isDefaultAttributeValue(value)) { - // render JSF "styleClass" attribute as "class" - String htmlAttrName = attrName.equals(HTML.STYLE_CLASS_ATTR) ? HTML.CLASS_ATTR - : attrName; - writer.writeAttribute(htmlAttrName, value, componentProperty); - return true; - } - return false; - } - /** - * See JSF Spec. 8.5 Table 8-1 - * @param value - * @return boolean - */ - public static boolean isDefaultAttributeValue(Object value) - { - if (value == null) - { - return true; - } - else if (value instanceof Boolean) - { - return ((Boolean)value).booleanValue() == false; - } - else if (value instanceof Number) - { - if (value instanceof Integer) - { - return ((Number)value).intValue() == Integer.MIN_VALUE; - } - else if (value instanceof Double) - { - return ((Number)value).doubleValue() == Double.MIN_VALUE; - } - else if (value instanceof Long) - { - return ((Number)value).longValue() == Long.MIN_VALUE; - } - else if (value instanceof Byte) - { - return ((Number)value).byteValue() == Byte.MIN_VALUE; - } - else if (value instanceof Float) - { - return ((Number)value).floatValue() == Float.MIN_VALUE; - } - else if (value instanceof Short) - { - return ((Number)value).shortValue() == Short.MIN_VALUE; - } - } - return false; - } - private HTML() - { - // disable instantiation - } - // Common attributes - public static final String ALIGN_ATTR = "align"; - public static final String DATAFLD_ATTR = "datafld"; - public static final String DATASRC_ATTR = "datasrc"; - public static final String DATAFORMATAS_ATTR = "dataformatas"; - public static final String BORDER_ATTR = "border"; - public static final String WIDTH_ATTR = "width"; - public static final String READONLY_ATTR = "readonly"; - public static final String FILE_ATTR = "file"; - public static final String ACCEPT_ATTR = "accept"; - // Common event handler attributes - public static final String ONCLICK_ATTR = "onclick"; - public static final String ONDBLCLICK_ATTR = "ondblclick"; - public static final String ONMOUSEDOWN_ATTR = "onmousedown"; - public static final String ONMOUSEUP_ATTR = "onmouseup"; - public static final String ONMOUSEOVER_ATTR = "onmouseover"; - public static final String ONMOUSEMOVE_ATTR = "onmousemove"; - public static final String ONMOUSEOUT_ATTR = "onmouseout"; - public static final String ONKEYPRESS_ATTR = "onkeypress"; - public static final String ONKEYDOWN_ATTR = "onkeydown"; - public static final String ONKEYUP_ATTR = "onkeyup"; - public static final String[] EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK = - { - ONDBLCLICK_ATTR, - ONMOUSEDOWN_ATTR, - ONMOUSEUP_ATTR, - ONMOUSEOVER_ATTR, - ONMOUSEMOVE_ATTR, - ONMOUSEOUT_ATTR, - ONKEYPRESS_ATTR, - ONKEYDOWN_ATTR, - ONKEYUP_ATTR - }; - public static final String[] EVENT_HANDLER_ATTRIBUTES = - concat( - EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK, - new String[] {ONCLICK_ATTR}); - // Input field event handler attributes - public static final String ONFOCUS_ATTR = "onfocus"; - public static final String ONBLUR_ATTR = "onblur"; - public static final String ONSELECT_ATTR = "onselect"; - public static final String ONCHANGE_ATTR = "onchange"; - public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES = - { - ONFOCUS_ATTR, - ONBLUR_ATTR, - ONSELECT_ATTR, - ONCHANGE_ATTR - }; - public static final String[] COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS = - { - ONBLUR_ATTR, - ONSELECT_ATTR, - ONCHANGE_ATTR - }; - // universal attributes - public static final String DIR_ATTR = "dir"; - public static final String LANG_ATTR = "lang"; - public static final String STYLE_ATTR = "style"; - public static final String TITLE_ATTR = "title"; - public static final String STYLE_CLASS_ATTR = "styleClass"; //"class" cannot be used as property name - public static final String[] UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE = - { - DIR_ATTR, - LANG_ATTR, - TITLE_ATTR, - //NOTE: if changed, please verify universal attributes in HtmlMessageRenderer ! - }; - public static final String[] UNIVERSAL_ATTRIBUTES = - concat( - UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE, - new String[] {STYLE_ATTR, STYLE_CLASS_ATTR}); - //universal, but not the same property-name - - //styleClass attribute is rendered as such - public static final String CLASS_ATTR = "class"; - // common form field attributes - public static final String ACCESSKEY_ATTR = "accesskey"; - public static final String TABINDEX_ATTR = "tabindex"; - public static final String DISABLED_ATTR = "disabled"; - public static final String[] COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED = - { - ACCESSKEY_ATTR, - TABINDEX_ATTR - }; - public static final String[] COMMON_FIELD_ATTRIBUTES = - concat( - COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED, - new String[] {DISABLED_ATTR}); - // Common Attributes - public static final String[] COMMON_PASSTROUGH_ATTRIBUTES = - concat( - EVENT_HANDLER_ATTRIBUTES, - UNIVERSAL_ATTRIBUTES); - public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE = - concat( - EVENT_HANDLER_ATTRIBUTES, - UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE); - public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK = - concat( - EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK, - UNIVERSAL_ATTRIBUTES); - public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE = - concat( - EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK, - UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE); - public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED = - concat( - COMMON_PASSTROUGH_ATTRIBUTES, - COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED, - COMMON_FIELD_EVENT_ATTRIBUTES); - public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS = - concat( - COMMON_PASSTROUGH_ATTRIBUTES, - COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED, - COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS); - public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK = - concat( - COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK, - COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED, - COMMON_FIELD_EVENT_ATTRIBUTES_WITHOUT_ONFOCUS); - public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK = - concat( - COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK, - COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED, - COMMON_FIELD_EVENT_ATTRIBUTES); - // <a> - public static final String TARGET_ATTR = "target"; //used by <a> and <form> - public static final String CHARSET_ATTR = "charset"; - public static final String COORDS_ATTR = "coords"; - public static final String HREF_ATTR = "href"; - public static final String HREFLANG_ATTR = "hreflang"; - public static final String REL_ATTR = "rel"; - public static final String REV_ATTR = "rev"; - public static final String SHAPE_ATTR = "shape"; - public static final String TYPE_ATTR = "type"; - public static final String[] ANCHOR_ATTRIBUTES = - { - ACCESSKEY_ATTR, - CHARSET_ATTR, - COORDS_ATTR, - HREFLANG_ATTR, - REL_ATTR, - REV_ATTR, - SHAPE_ATTR, - TABINDEX_ATTR, - TARGET_ATTR, - TYPE_ATTR - }; - public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES = - concat( - ANCHOR_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES); - public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE = - concat( - ANCHOR_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE); - public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE = - concat( - ANCHOR_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE); - // <form> - public static final String ACCEPT_CHARSET_ATTR = "accept-charset"; - public static final String ENCTYPE_ATTR = "enctype"; - public static final String ONRESET_ATTR = "onreset"; - public static final String ONSUMBIT_ATTR = "onsubmit"; - public static final String[] FORM_ATTRIBUTES = - { - ACCEPT_ATTR, - ACCEPT_CHARSET_ATTR, - ENCTYPE_ATTR, - ONRESET_ATTR, - ONSUMBIT_ATTR, - TARGET_ATTR, - }; - public static final String[] FORM_PASSTHROUGH_ATTRIBUTES = - concat( - FORM_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES); - // <img> - public static final String SRC_ATTR = "src"; - public static final String ALT_ATTR = "alt"; - public static final String HEIGHT_ATTR = "height"; - public static final String HSPACE_ATTR = "hspace"; - public static final String ISMAP_ATTR = "ismap"; - public static final String LONGDESC_ATTR = "longdesc"; - public static final String USEMAP_ATTR = "usemap"; - public static final String VSPACE_ATTR = "vspace"; - public static final String[] IMG_ATTRIBUTES = - { - ALIGN_ATTR, - ALT_ATTR, - BORDER_ATTR, - HEIGHT_ATTR, - HSPACE_ATTR, - ISMAP_ATTR, - LONGDESC_ATTR, - USEMAP_ATTR, - VSPACE_ATTR, - WIDTH_ATTR - }; - public static final String[] IMG_PASSTHROUGH_ATTRIBUTES = - concat( - IMG_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES); - // <input> - public static final String SIZE_ATTR = "size"; - private static final String AUTOCOMPLETE_ATTR = "autocomplete"; - public static final String CHECKED_ATTR = "checked"; - public static final String MAXLENGTH_ATTR = "maxlength"; - public static final String[] INPUT_ATTRIBUTES = { - ALIGN_ATTR, - ALT_ATTR, - CHECKED_ATTR, - DATAFLD_ATTR, - DATASRC_ATTR, - DATAFORMATAS_ATTR, - MAXLENGTH_ATTR, - READONLY_ATTR, - SIZE_ATTR, - AUTOCOMPLETE_ATTR - }; - public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED = - concat( - INPUT_ATTRIBUTES, - COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED); - public static final String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK = - concat( - INPUT_ATTRIBUTES, - COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK); - //values for input-type attribute - public static final String INPUT_TYPE_SUBMIT = "submit"; - public static final String INPUT_TYPE_IMAGE = "image"; - public static final String INPUT_TYPE_HIDDEN = "hidden"; - public static final String INPUT_TYPE_CHECKBOX = "checkbox"; - public static final String INPUT_TYPE_PASSWORD = "password"; - public static final String INPUT_TYPE_TEXT = "text"; - public static final String INPUT_TYPE_RADIO = "radio"; - public static final String INPUT_TYPE_BUTTON = "button"; - // <button> - public static final String[] BUTTON_ATTRIBUTES = - { - ALIGN_ATTR, - ALT_ATTR, - DATAFLD_ATTR, - DATASRC_ATTR, - DATAFORMATAS_ATTR, - }; - public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED = - concat( - BUTTON_ATTRIBUTES, - COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED); - public static final String[] BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK = - concat( - BUTTON_ATTRIBUTES, - COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK); - // <iframe> - public static final String FRAMEBORDER_ATTR = "frameborder"; - public static final String SCROLLING_ATTR = "scrolling"; - // <label> - public static final String FOR_ATTR = "for"; - public static final String[] LABEL_ATTRIBUTES = - { - ACCESSKEY_ATTR, - ONBLUR_ATTR, - ONFOCUS_ATTR - //FOR_ATTR is no pass through ! - }; - public static final String[] LABEL_PASSTHROUGH_ATTRIBUTES = - concat( - LABEL_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES); - // <select> - public static final String MULTIPLE_ATTR = "multiple"; - public static final String[] SELECT_ATTRIBUTES = - { - DATAFLD_ATTR, - DATASRC_ATTR, - DATAFORMATAS_ATTR, - }; - public static final String[] SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED = - concat( - SELECT_ATTRIBUTES, - COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED); - // <table> - public static final String BGCOLOR_ATTR = "bgcolor"; - public static final String CELLPADDING_ATTR = "cellpadding"; - public static final String CELLSPACING_ATTR = "cellspacing"; - public static final String FRAME_ATTR = "frame"; - public static final String RULES_ATTR = "rules"; - public static final String SUMMARY_ATTR = "summary"; - public static final String[] TABLE_ATTRIBUTES = { - ALIGN_ATTR, - BGCOLOR_ATTR, - BORDER_ATTR, - CELLPADDING_ATTR, - CELLSPACING_ATTR, - DATAFLD_ATTR, - DATASRC_ATTR, - DATAFORMATAS_ATTR, - FRAME_ATTR, - RULES_ATTR, - SUMMARY_ATTR, - WIDTH_ATTR - }; - public static final String[] TABLE_PASSTHROUGH_ATTRIBUTES = - concat( - TABLE_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES); - // <textarea> - public static final String COLS_ATTR = "cols"; - public static final String ROWS_ATTR = "rows"; - public static final String[] TEXTAREA_ATTRIBUTES = - { - COLS_ATTR, - DATAFLD_ATTR, - DATASRC_ATTR, - DATAFORMATAS_ATTR, - READONLY_ATTR, - ROWS_ATTR, - }; - public static final String[] TEXTAREA_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED = - concat( - TEXTAREA_ATTRIBUTES, - COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED); - // <input type=file> - public static final String[] INPUT_FILE_UPLOAD_ATTRIBUTES = - { - ACCEPT_ATTR - }; - public static final String[] INPUT_FILE_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED = - concat( - INPUT_FILE_UPLOAD_ATTRIBUTES, - INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED); - /* - public static final String[] MESSAGE_PASSTHROUGH_ATTRIBUTES = - concat( - new String[] {DIR_ATTR, LANG_ATTR, TITLE_ATTR, STYLE_ATTR, STYLE_CLASS_ATTR}, - EVENT_HANDLER_ATTRIBUTES); - */ - public static final String[] MESSAGE_PASSTHROUGH_ATTRIBUTES_WITHOUT_TITLE_STYLE_AND_STYLE_CLASS = - concat( - new String[] {DIR_ATTR, LANG_ATTR}, - EVENT_HANDLER_ATTRIBUTES); - // selectOne/Many table - public static final String[] SELECT_TABLE_PASSTHROUGH_ATTRIBUTES = - new String[] {STYLE_ATTR, STYLE_CLASS_ATTR, BORDER_ATTR}; - public static final String COMPACT_ATTR = "compact"; - public static final String[] UL_ATTRIBUTES = { - COMPACT_ATTR, - TYPE_ATTR - }; - public static final String[] UL_PASSTHROUGH_ATTRIBUTES = - concat( - UL_ATTRIBUTES, - COMMON_PASSTROUGH_ATTRIBUTES); - //HTML attributes needed for renderding only - public static final String ID_ATTR = "id"; - public static final String NAME_ATTR = "name"; - public static final String VALUE_ATTR = "value"; - public static final String METHOD_ATTR = "method"; - public static final String ACTION_ATTR = "action"; - public static final String COLSPAN_ATTR = "colspan"; - public static final String SCOPE_ATTR = "scope"; - public static final String LABEL_ATTR = "label"; - public static final String SELECTED_ATTR = "selected"; - //HTML attributes values - public static final String SCOPE_COLGROUP_VALUE = "colgroup"; - //HTML element constants - public static final String SPAN_ELEM = "span"; - public static final String DIV_ELEM = "div"; - public static final String INPUT_ELEM = "input"; - public static final String BUTTON_ELEM = "button"; - public static final String SELECT_ELEM = "select"; - public static final String OPTION_ELEM = "option"; - public static final String OPTGROUP_ELEM = "optgroup"; - public static final String TEXTAREA_ELEM = "textarea"; - public static final String FORM_ELEM = "form"; - public static final String ANCHOR_ELEM = "a"; - public static final String H1_ELEM = "h1"; - public static final String H2_ELEM = "h2"; - public static final String H3_ELEM = "h3"; - public static final String H4_ELEM = "h4"; - public static final String H5_ELEM = "h5"; - public static final String H6_ELEM = "h6"; - public static final String IFRAME_ELEM = "iframe"; - public static final String IMG_ELEM = "img"; - public static final String LABEL_ELEM = "label"; - public static final String TABLE_ELEM = "table"; - public static final String TR_ELEM = "tr"; - public static final String TH_ELEM = "th"; - public static final String TD_ELEM = "td"; - public static final String TBODY_ELEM = "tbody"; - public static final String TFOOT_ELEM = "tfoot"; - public static final String THEAD_ELEM = "thead"; - public static final String STYLE_ELEM = "style"; - public static final String SCRIPT_ELEM = "script"; - public static final String SCRIPT_TYPE_ATTR = "type"; - public static final String SCRIPT_TYPE_TEXT_JAVASCRIPT = "text/javascript"; - public static final String SCRIPT_LANGUAGE_ATTR = "language"; - public static final String SCRIPT_LANGUAGE_JAVASCRIPT = "JavaScript"; - public static final String UL_ELEM = "ul"; - public static final String OL_ELEM = "ol"; - public static final String LI_ELEM = "li"; - //HTML simple element constants - public static final String BR_ELEM = "br"; - //HTML entities - public static final String NBSP_ENTITY = " "; - public static final String HREF_PATH_SEPARATOR = "/"; - public static final String HREF_PATH_FROM_PARAM_SEPARATOR = "?"; - public static final String HREF_PARAM_SEPARATOR = "&"; - public static final String HREF_PARAM_NAME_FROM_VALUE_SEPARATOR = "="; -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/JSF.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/JSF.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/JSF.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,232 +0,0 @@ -/* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.seam.ui.util; - -import java.io.IOException; -import java.util.List; - -import javax.el.ValueExpression; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - -/** - * Constant declarations for JSF tags - * - * @author Anton Koinov - * @author Manfred Geiler - * - */ -public class JSF -{ - - // Common Attributes - public static final String ID_ATTR = "id"; - - public static final String VALUE_ATTR = "value"; - - public static final String BINDING_ATTR = "binding"; - - public static final String STYLE_CLASS_ATTR = "styleClass"; - - public static final String ESCAPE_ATTR = "escape"; - - // Common Output Attributes - public static final String FOR_ATTR = "for"; - - public static final String CONVERTER_ATTR = "converter"; - - // Ouput_Time Attributes - public static final String TIME_STYLE_ATTR = "timeStyle"; - - public static final String TIMEZONE_ATTR = "timezone"; - - // Common Input Attributes - public static final String REQUIRED_ATTR = "required"; - - public static final String VALIDATOR_ATTR = "validator"; - - // Input_Secret Attributes - public static final String REDISPLAY_ATTR = "redisplay"; - - // Input_Checkbox Attributes - public static final String LAYOUT_ATTR = "layout"; - - // Select_Menu Attributes - public static final String SIZE_ATTR = "size"; - - // SelectMany Checkbox List/ Select One Radio Attributes - public static final String BORDER_ATTR = "border"; - - public static final String DISABLED_CLASS_ATTR = "disabledClass"; - - public static final String ENABLED_CLASS_ATTR = "enabledClass"; - - // Common Command Attributes - /** @deprecated */ - public static final String COMMAND_CLASS_ATTR = "commandClass"; - - public static final String LABEL_ATTR = "label"; - - public static final String IMAGE_ATTR = "image"; - - public static final String ACTION_ATTR = "action"; - - public static final String IMMEDIATE_ATTR = "immediate"; - - // Command_Button Attributes - public static final String TYPE_ATTR = "type"; - - // Common Panel Attributes - /** @deprecated */ - public static final String PANEL_CLASS_ATTR = "panelClass"; - - public static final String FOOTER_CLASS_ATTR = "footerClass"; - - public static final String HEADER_CLASS_ATTR = "headerClass"; - - public static final String COLUMN_CLASSES_ATTR = "columnClasses"; - - public static final String ROW_CLASSES_ATTR = "rowClasses"; - - // Panel_Grid Attributes - public static final String COLUMNS_ATTR = "columns"; - - public static final String COLSPAN_ATTR = "colspan"; // extension - - // UIMessage and UIMessages attributes - public static final String SHOW_SUMMARY_ATTR = "showSummary"; - - public static final String SHOW_DETAIL_ATTR = "showDetail"; - - public static final String GLOBAL_ONLY_ATTR = "globalOnly"; - - // HtmlOutputMessage attributes - public static final String ERROR_CLASS_ATTR = "errorClass"; - - public static final String ERROR_STYLE_ATTR = "errorStyle"; - - public static final String FATAL_CLASS_ATTR = "fatalClass"; - - public static final String FATAL_STYLE_ATTR = "fatalStyle"; - - public static final String INFO_CLASS_ATTR = "infoClass"; - - public static final String INFO_STYLE_ATTR = "infoStyle"; - - public static final String WARN_CLASS_ATTR = "warnClass"; - - public static final String WARN_STYLE_ATTR = "warnStyle"; - - public static final String TITLE_ATTR = "title"; - - public static final String TOOLTIP_ATTR = "tooltip"; - - // GraphicImage attributes - public static final String URL_ATTR = "url"; - - // UISelectItem attributes - public static final String ITEM_DISABLED_ATTR = "itemDisabled"; - - public static final String ITEM_DESCRIPTION_ATTR = "itemDescription"; - - public static final String ITEM_LABEL_ATTR = "itemLabel"; - - public static final String ITEM_VALUE_ATTR = "itemValue"; - - // UIData attributes - public static final String ROWS_ATTR = "rows"; - - public static final String VAR_ATTR = "var"; - - public static final String FIRST_ATTR = "first"; - - public static void renderChildren(FacesContext facesContext, - UIComponent component) throws IOException - { - List children = component.getChildren(); - for (int j=0, size = component.getChildCount(); j<size; j++) - { - UIComponent child = (UIComponent) children.get(j); - renderChild(facesContext, child); - } - } - - public static void renderChild(FacesContext facesContext, UIComponent child) - throws IOException - { - if ( child.isRendered() ) - { - child.encodeBegin(facesContext); - if ( child.getRendersChildren() ) - { - child.encodeChildren(facesContext); - } - else - { - renderChildren(facesContext, child); - } - child.encodeEnd(facesContext); - } - } - - public static String getStringValue(FacesContext context, ValueExpression vb) - { - Object value = vb.getValue(context.getELContext()); - if (value == null) - { - return null; - } - return value.toString(); - } - - public static Integer getIntegerValue(FacesContext context, ValueExpression vb) - { - String value = getStringValue(context, vb); - if (value == null) - { - return null; - } - return new Integer(value); - } - - public static Double getDoubleValue(FacesContext context, ValueExpression vb) - { - String value = getStringValue(context, vb); - if (value == null) - { - return null; - } - return new Double(value); - } - - public static Boolean getBooleanValue(FacesContext context, ValueExpression vb) - { - Object value = vb.getValue(context.getELContext()); - if (value == null) - { - return null; - } - if (value instanceof Boolean) - { - return (Boolean) value; - } - else - { - return Boolean.valueOf(value.toString()); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/UrlBuilder.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/UrlBuilder.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/UrlBuilder.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,112 +0,0 @@ -package org.jboss.seam.ui.util; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.LinkedHashMap; -import java.util.Map; - -import javax.faces.component.UIParameter; - -public class UrlBuilder -{ - private static final String URL_ENCODING = "UTF-8"; - - private String url; - - private String fragment; - private String characterEncoding; - - private boolean urlEncodeParameters = true; - - private Map<String, String> parameters; - - protected UrlBuilder(String fragment, String characterEncoding) - { - this.fragment = fragment; - parameters = new LinkedHashMap<String, String>(); - this.characterEncoding = characterEncoding; - } - - public UrlBuilder(String fragment, String characterEncoding, boolean urlEncodeParameters) - { - this(fragment, characterEncoding); - this.urlEncodeParameters = urlEncodeParameters; - } - - public UrlBuilder(String url, String fragment, String characterEncoding) - { - this(fragment, characterEncoding); - setUrl(url); - } - - public UrlBuilder(String url, String fragment, String characterEncoding, boolean urlEncodeParameters) - { - this(url, fragment, characterEncoding); - this.urlEncodeParameters = urlEncodeParameters; - } - - protected void setUrl(String url) - { - if (url == null) - { - throw new NullPointerException("url must not be null"); - } - this.url = url; - } - - protected String urlEncode(String value) throws UnsupportedEncodingException - { - return characterEncoding == null ? URLEncoder.encode(value, URL_ENCODING) : URLEncoder.encode(value, - characterEncoding); - } - - protected String getFragment() - { - if (fragment != null && !"".equals(fragment)) - { - return "#" + fragment; - } - else - { - return ""; - } - } - - public String getEncodedUrl() - { - String params = getParametersAsString(); - if (!"".equals(params) && !url.contains("?")) - { - params = "?" + params.substring(1); - } - return url + params + getFragment(); - } - - protected String getParametersAsString() - { - String params = ""; - for (String key : parameters.keySet()) - { - params += "&" + key + "=" + parameters.get(key); - } - return params; - } - - protected Map<String, String> getParameters() - { - return parameters; - } - - public void addParameter(String name, String value) throws UnsupportedEncodingException - { - parameters.put(name, urlEncodeParameters ? urlEncode(value) : value); - } - - public void addParameter(UIParameter parameter) throws UnsupportedEncodingException - { - String value = parameter.getValue() == null ? "" : parameter.getValue().toString(); - String name = parameter.getName(); - addParameter(name, value); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/ViewUrlBuilder.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,54 +0,0 @@ - -package org.jboss.seam.ui.util; - -import java.io.UnsupportedEncodingException; - -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; - -import org.jboss.seam.navigation.Page; -import org.jboss.seam.navigation.Pages; - -public class ViewUrlBuilder extends UrlBuilder -{ - - private Page page; - - public ViewUrlBuilder(String viewId, String fragment, boolean urlEncodeParameters) - { - super(fragment, FacesContext.getCurrentInstance().getResponseWriter().getCharacterEncoding(), urlEncodeParameters); - if (viewId == null) - { - throw new NullPointerException("viewId must not be null"); - } - FacesContext facesContext = FacesContext.getCurrentInstance(); - String url = facesContext.getApplication().getViewHandler().getActionURL(facesContext, - viewId); - url = Pages.instance().encodeScheme(viewId, facesContext, url); - setUrl(url); - - page = Pages.instance().getPage(viewId); - } - - public ViewUrlBuilder(String viewId, String fragment) - { - this(viewId, fragment, true); - - } - - @Override - public void addParameter(UIParameter parameter) throws UnsupportedEncodingException - { - String name = parameter.getName(); - if (parameter.getValue() != null && !(name.equals(page.getConversationIdParameter().getParameterName()) - && getParameters().containsKey(name))) - { - super.addParameter(parameter); - } - } - - @Override - public String getEncodedUrl() { - return FacesContext.getCurrentInstance().getExternalContext().encodeActionURL(super.getEncodedUrl()); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/Messages.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,311 +0,0 @@ -package org.jboss.seam.ui.util.cdk; - -import java.text.MessageFormat; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; - -public class Messages { - private static final String BUNDLE_NAME = "org.ajax4jsf.messages"; - - private static Map<ClassLoader, ResourceBundle> bundles = new HashMap<ClassLoader, ResourceBundle>(); - - private static synchronized ResourceBundle getBundle() { - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - ResourceBundle bundle = bundles.get(contextClassLoader); - if (bundle == null) { - bundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault(), contextClassLoader); - bundles.put(contextClassLoader, bundle); - } - - return bundle; - } - - public static final String getMessage(String name) { - String value = getBundle().getString(name); - return value == null ? "%" + name + "%" : value; - } - - public static final String getMessage(String name, Object param) { - String pattern = getBundle().getString(name); - if(pattern == null) return "%" + name + "%"; - return MessageFormat.format(pattern, new Object[]{param}); - } - - public static final String getMessage(String name, Object param1, Object param2) { - String pattern = getBundle().getString(name); - if(pattern == null) return "%" + name + "%"; - return MessageFormat.format(pattern, new Object[]{param1, param2}); - } - - public static final String getMessage(String name, Object[] params) { - String pattern = getBundle().getString(name); - if(pattern == null) return "%" + name + "%"; - return MessageFormat.format(pattern, params); - } - - public static final String BUNDLE_MAP_NO_PUT_VALUE = "BUNDLE_MAP_NO_PUT_VALUE"; - public static final String BUNDLE_MAP_NO_REMOVE_VALUE = "BUNDLE_MAP_NO_REMOVE_VALUE"; - public static final String NO_CONVERTER_REGISTERED = "NO_CONVERTER_REGISTERED"; - public static final String FOR_TARGETS_NO_AJAX_CONTAINER = "FOR_TARGETS_NO_AJAX_CONTAINER"; - public static final String VAR_MUST_BE_LITERAL = "VAR_MUST_BE_LITERAL"; - public static final String EVENT_MUST_BE_LITERAL = "EVENT_MUST_BE_LITERAL"; - public static final String CREATE_JAVASCRIPT_EVENT = "CREATE_JAVASCRIPT_EVENT"; - public static final String CALLED_SET_PARENT = "CALLED_SET_PARENT"; - public static final String DETECT_NEW_COMPONENT = "DETECT_NEW_COMPONENT"; - public static final String SET_VALUE_BINDING_FOR_EVENT = "SET_VALUE_BINDING_FOR_EVENT"; - public static final String COULD_NOT_LOAD_RESOURCE_BUNDLE = "COULD_NOT_LOAD_RESOURCE_BUNDLE"; - public static final String FACES_CONTEXT_NOT_CREATED = "FACES_CONTEXT_NOT_CREATED"; - public static final String FACES_CONTEXT_HAS_NOT_EXTERNAL = "FACES_CONTEXT_HAS_NOT_EXTERNAL"; - public static final String FACES_CONTEXT_HAS_NOT_RESPONSE = "FACES_CONTEXT_HAS_NOT_RESPONSE"; - public static final String CREATE_ALTERNATE_HANDLER = "CREATE_ALTERNATE_HANDLER"; - public static final String ALTERNATE_HANDLER_CONSTRUCTOR_WARNING = "ALTERNATE_HANDLER_CONSTRUCTOR_WARNING"; - public static final String VIEW_HANDLER_INSTANTIATION_ERROR = "VIEW_HANDLER_INSTANTIATION_ERROR"; - public static final String ERROR_ON_PAGE = "ERROR_ON_PAGE"; - public static final String LIFECYCLE_ERROR = "LIFECYCLE_ERROR"; - public static final String LIFECYCLE_ERROR_AT_PHASE = "LIFECYCLE_ERROR_AT_PHASE"; - public static final String COMPONENT_TREE_NOT_CREATED = "COMPONENT_TREE_NOT_CREATED"; - public static final String SET_AJAX_LISTENER = "SET_AJAX_LISTENER"; - public static final String ADD_AJAX_AREA = "ADD_AJAX_AREA"; - public static final String ADD_AJAX_AREAS = "ADD_AJAX_AREAS"; - public static final String SET_AJAX_REQUEST = "SET_AJAX_REQUEST"; - public static final String SUBMITTED_AJAX_REQUEST = "SUBMITTED_AJAX_REQUEST"; - public static final String SEND_EVENT_TO_AJAX_LISTENER = "SEND_EVENT_TO_AJAX_LISTENER"; - public static final String RENDER_AJAX_REQUEST = "RENDER_AJAX_REQUEST"; - public static final String RENDERING_AJAX_REGION_ERROR = "RENDERING_AJAX_REGION_ERROR"; - public static final String RESTORE_AJAX_COMPONENT_STATE = "RESTORE_AJAX_COMPONENT_STATE"; - public static final String SAVE_AJAX_COMPONENT_STATE = "SAVE_AJAX_COMPONENT_STATE"; - public static final String CREATE_AJAX_AREAS_SET_TO_RENDER = "CREATE_AJAX_AREAS_SET_TO_RENDER"; - public static final String ARGUMENT_IS_NOT_AJAX_REGION_ERROR = "ARGUMENT_IS_NOT_AJAX_REGION_ERROR"; - public static final String NULL_EVENT_SUBMITTED_ERROR = "NULL_EVENT_SUBMITTED_ERROR"; - public static final String CONTENT_TYPE_ENCODING = "CONTENT_TYPE_ENCODING"; - public static final String CONTENT_TYPE_NO_ENCODING = "CONTENT_TYPE_NO_ENCODING"; - public static final String FILTER_START_INFO = "FILTER_START_INFO"; - public static final String FILTER_XML_OUTPUT = "FILTER_XML_OUTPUT"; - public static final String FILTER_NO_XML_CHAIN = "FILTER_NO_XML_CHAIN"; - public static final String FILTER_NO_XML_CHAIN_2 = "FILTER_NO_XML_CHAIN_2"; - public static final String FILTER_STOP_INFO = "FILTER_STOP_INFO"; - public static final String PARSER_NOT_INSTANTIATED_ERROR = "PARSER_NOT_INSTANTIATED_ERROR"; - public static final String PARSING_TIME_INFO = "PARSING_TIME_INFO"; - public static final String JTIDY_PARSING_ERROR = "JTIDY_PARSING_ERROR"; - public static final String COMPONENT_NOT_FOUND = "COMPONENT_NOT_FOUND"; - public static final String EVENT_IS_READ_ONLY = "EVENT_IS_READ_ONLY"; - public static final String FLUSH_BUFFERED_STREAM_ERROR = "FLUSH_BUFFERED_STREAM_ERROR"; - public static final String UNSUPPORTED_ENCODING_WARNING = "UNSUPPORTED_ENCODING_WARNING"; - public static final String UNSUPPORTED_ENCODING_WARNING_2 = "UNSUPPORTED_ENCODING_WARNING_2"; - public static final String NO_WRITER_CALLED_INFO = "NO_WRITER_CALLED_INFO"; - public static final String PARSE_XML_DOCUMENT_INFO = "PARSE_XML_DOCUMENT_INFO"; - public static final String NO_WRITER_POSSIBLE_ERROR = "NO_WRITER_POSSIBLE_ERROR"; - public static final String CREATE_WRITER_INFO = "CREATE_WRITER_INFO"; - public static final String NO_STREAM_POSSIBLE_ERROR = "NO_STREAM_POSSIBLE_ERROR"; - public static final String CREATE_STREAM_INFO = "CREATE_STREAM_INFO"; - public static final String OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR = "OPEN_CLOSE_TAGS_DO_NOT_MATCH_ERROR"; - public static final String VARIABLE_SUBSTITUTION_WARNING = "VARIABLE_SUBSTITUTION_WARNING"; - public static final String START_DOCUMENT_SAX_EXCEPTION = "START_DOCUMENT_SAX_EXCEPTION"; - public static final String COMMENT_SAX_EXCEPTION = "COMMENT_SAX_EXCEPTION"; - public static final String END_ELEMENT_SAX_EXCEPTION = "END_ELEMENT_SAX_EXCEPTION"; - public static final String END_DOCUMENT_SAX_EXCEPTION = "END_DOCUMENT_SAX_EXCEPTION"; - public static final String START_ELEMENT_SAX_EXCEPTION = "START_ELEMENT_SAX_EXCEPTION"; - public static final String TEXT_SAX_EXCEPTION = "TEXT_SAX_EXCEPTION"; - public static final String MESSAGE_PARSING_INFO = "MESSAGE_PARSING_INFO"; - public static final String CREATE_JTIDY_INFO = "CREATE_JTIDY_INFO"; - public static final String READING_TIDY_PROPERTIES_ERROR = "READING_TIDY_PROPERTIES_ERROR"; - public static final String ILLEGAL_METHOD_STATE = "ILLEGAL_METHOD_STATE"; - public static final String WRAPPED_RULES_NULL_ERROR = "WRAPPED_RULES_NULL_ERROR"; - public static final String NO_NAME_ATTRIBUTE_ERROR = "NO_NAME_ATTRIBUTE_ERROR"; - public static final String ENCODE_COMPILED_TEMPLATE_INFO = "ENCODE_COMPILED_TEMPLATE_INFO"; - public static final String ENCODING_TEMPLATE_TERMINATED_INFO = "ENCODING_TEMPLATE_TERMINATED_INFO"; - public static final String ENCODE_COMPILED_TEMPLATE_INFO2 = "ENCODE_COMPILED_TEMPLATE_INFO2"; - public static final String CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR = "CONVERTING_NON_VALUE_HOLDER_COMPONENT_ERROR"; - public static final String COMPONENT_CLASS_ERROR = "COMPONENT_CLASS_ERROR"; - public static final String CONTEXT_NULL_ERROR = "CONTEXT_NULL_ERROR"; - public static final String COMPONENT_NULL_ERROR = "COMPONENT_NULL_ERROR"; - public static final String START_DECODING_COMPONENT_INFO = "START_DECODING_COMPONENT_INFO"; - public static final String START_ENCODING_COMPONENT_INFO = "START_ENCODING_COMPONENT_INFO"; - public static final String CHILDREN_ENCODING_COMPONENT_INFO = "CHILDREN_ENCODING_COMPONENT_INFO"; - public static final String FINISH_ENCODING_COMPONENT_INFO = "FINISH_ENCODING_COMPONENT_INFO"; - public static final String NAMESPACE_NOT_RECOGNIZED_ERROR = "NAMESPACE_NOT_RECOGNIZED_ERROR"; - public static final String RENDERER_METHOD_NOT_SET_ERROR = "RENDERER_METHOD_NOT_SET_ERROR"; - public static final String METHOD_CALL_ERROR_1 = "METHOD_CALL_ERROR_1"; - public static final String METHOD_CALL_ERROR_2 = "METHOD_CALL_ERROR_2"; - public static final String METHOD_CALL_ERROR_3 = "METHOD_CALL_ERROR_3"; - public static final String METHOD_CALL_ERROR_4 = "METHOD_CALL_ERROR_4"; - public static final String METHOD_CALL_ERROR_5 = "METHOD_CALL_ERROR_5"; - public static final String METHOD_CALL_ERROR_6 = "METHOD_CALL_ERROR_6"; - public static final String METHOD_CALL_ERROR_1a = "METHOD_CALL_ERROR_1a"; - public static final String METHOD_CALL_ERROR_2a = "METHOD_CALL_ERROR_2a"; - public static final String METHOD_CALL_ERROR_3a = "METHOD_CALL_ERROR_3a"; - public static final String METHOD_CALL_ERROR_4a = "METHOD_CALL_ERROR_4a"; - public static final String METHOD_CALL_ERROR_5a = "METHOD_CALL_ERROR_5a"; - public static final String METHOD_CALL_ERROR_6a = "METHOD_CALL_ERROR_6a"; - public static final String PARSING_TEMPLATE_ERROR = "PARSING_TEMPLATE_ERROR"; - public static final String TEMPLATE_IO_ERROR = "TEMPLATE_IO_ERROR"; - public static final String PARSING_TEMPLATE_ERROR_2 = "PARSING_TEMPLATE_ERROR_2"; - public static final String START_COMPILE_TEMPLATE_INFO = "START_COMPILE_TEMPLATE_INFO"; - public static final String PARSING_TEMPLATE_ERROR_a = "PARSING_TEMPLATE_ERROR_a"; - public static final String TEMPLATE_IO_ERROR_a = "TEMPLATE_IO_ERROR_a"; - public static final String PARSING_TEMPLATE_ERROR_2a = "PARSING_TEMPLATE_ERROR_2a"; - public static final String FINISH_COMPILE_TEMPLATE_INFO = "FINISH_COMPILE_TEMPLATE_INFO"; - public static final String TEMPLATE_NOT_COMPILED_ERROR = "TEMPLATE_NOT_COMPILED_ERROR"; - public static final String NO_CHILD_ALLOWED = "NO_CHILD_ALLOWED"; - public static final String NO_FACET_NAME_ATTRIBUTE = "NO_FACET_NAME_ATTRIBUTE"; - public static final String BREAKPOINTS_UNSUPPORTED_ERROR = "BREAKPOINTS_UNSUPPORTED_ERROR"; - public static final String BREAKPOINT_NOT_REGISTERED_ERROR = "BREAKPOINT_NOT_REGISTERED_ERROR"; - public static final String CHILD_NOT_ALLOWED_ERROR = "CHILD_NOT_ALLOWED_ERROR"; - public static final String INVOKE_RENDERER_METHOD_ERROR = "INVOKE_RENDERER_METHOD_ERROR"; - public static final String METHOD_CALL_ERROR_2b = "METHOD_CALL_ERROR_2b"; - public static final String METHOD_CALL_ERROR_4b = "METHOD_CALL_ERROR_4b"; - public static final String METHOD_CALL_ERROR_6b = "METHOD_CALL_ERROR_6b"; - public static final String STYLE_ATTRIBUTE_ERROR = "STYLE_ATTRIBUTE_ERROR"; - public static final String BREAKPOINTS_UNSUPPORTED_ERROR_2 = "BREAKPOINTS_UNSUPPORTED_ERROR_2"; - public static final String BREAKPOINTS_UNSUPPORTED_ERROR_3 = "BREAKPOINTS_UNSUPPORTED_ERROR_3"; - public static final String REQUEST_CHAMELEON_RENDER_KIT_INFO = "REQUEST_CHAMELEON_RENDER_KIT_INFO"; - public static final String GET_DEFAULT_RENDER_KIT_ERROR = "GET_DEFAULT_RENDER_KIT_ERROR"; - public static final String DEFAULT_RENDER_KIT_INFO = "DEFAULT_RENDER_KIT_INFO"; - public static final String AJAX_RESPONSE_NOT_RENDERED_INFO = "AJAX_RESPONSE_NOT_RENDERED_INFO"; - public static final String ENTER_BEFORE_RENDER_VIEW_PHASE = "ENTER_BEFORE_RENDER_VIEW_PHASE"; - public static final String SET_RENDER_KIT_ID_INFO = "SET_RENDER_KIT_ID_INFO"; - public static final String PROCESS_AJAX_EVENTS_INFO = "PROCESS_AJAX_EVENTS_INFO"; - public static final String DELEGATE_AJAX_PROCESSING_INFO = "DELEGATE_AJAX_PROCESSING_INFO"; - public static final String BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR = "BREAKPOINTS_UNSUPPORTED_INSIDE_ATTRIBUTE_ERROR"; - public static final String BUILD_ONCLICK_INFO = "BUILD_ONCLICK_INFO"; - public static final String UNNAMED_PARAMETER_ERROR = "UNNAMED_PARAMETER_ERROR"; - public static final String AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING = "AJAX_STATUS_COMPONENT_NOT_FOWND_WARNING"; - public static final String COMPONENT_NULL_ERROR_2 = "COMPONENT_NULL_ERROR_2"; - public static final String CALCULATE_COMPONENT_ID_INFO = "CALCULATE_COMPONENT_ID_INFO"; - public static final String DETECTING_ENCODING_DISABLED_ERROR = "DETECTING_ENCODING_DISABLED_ERROR"; - public static final String OBTAIN_RESPONSE_SET_HEADER_ERROR = "OBTAIN_RESPONSE_SET_HEADER_ERROR"; - public static final String INVOKE_AJAX_REGION_LISTENER = "INVOKE_AJAX_REGION_LISTENER"; - public static final String APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING = "APPENDING_AJAX_REGION_TO_NON_AJAX_CONTAINER_WARNING"; - public static final String RENDER_CHILDREN_NON_AJAX_INFO = "RENDER_CHILDREN_NON_AJAX_INFO"; - public static final String RENDER_CHILDREN_AJAX_INFO = "RENDER_CHILDREN_AJAX_INFO"; - public static final String ENCODE_CHILD_AJAX_INFO = "ENCODE_CHILD_AJAX_INFO"; - public static final String RENDER_AJAX_AREA_INFO = "RENDER_AJAX_AREA_INFO"; - public static final String DECODE_AJAX_REQUEST_STATUS_INFO = "DECODE_AJAX_REQUEST_STATUS_INFO"; - public static final String REQUEST_PARAMETERS_MAP = "REQUEST_PARAMETERS_MAP"; - public static final String SET_MYFACES_SEQUENCE_INFO = "SET_MYFACES_SEQUENCE_INFO"; - public static final String SKIP_ENCODING_HTML_INFO = "SKIP_ENCODING_HTML_INFO"; - public static final String SKIP_ENCODE_BEGIN_HTML_INFO = "SKIP_ENCODE_BEGIN_HTML_INFO"; - public static final String SKIP_ENCODE_END_HTML_INFO = "SKIP_ENCODE_END_HTML_INFO"; - public static final String QUERY_STRING_BUILDING_ERROR = "QUERY_STRING_BUILDING_ERROR"; - public static final String BUILD_RESOURCE_URI_INFO = "BUILD_RESOURCE_URI_INFO"; - public static final String RESTORE_DATA_FROM_RESOURCE_URI_INFO = "RESTORE_DATA_FROM_RESOURCE_URI_INFO"; - public static final String STREAM_CORRUPTED_ERROR = "STREAM_CORRUPTED_ERROR"; - public static final String DESERIALIZE_DATA_INPUT_ERROR = "DESERIALIZE_DATA_INPUT_ERROR"; - public static final String DATA_CLASS_NOT_FOUND_ERROR = "DATA_CLASS_NOT_FOUND_ERROR"; - public static final String METHOD_NOT_IMPLEMENTED = "METHOD_NOT_IMPLEMENTED"; - public static final String ENCODE_HTML_INFO = "ENCODE_HTML_INFO"; - public static final String ENCODE_HTML_INFO_2 = "ENCODE_HTML_INFO_2"; - public static final String ENCODE_BEGIN_HTML_INFO = "ENCODE_BEGIN_HTML_INFO"; - public static final String ENCODE_END_HTML_INFO = "ENCODE_END_HTML_INFO"; - public static final String SEND_CONTENT_INFO = "SEND_CONTENT_INFO"; - public static final String NO_INPUT_STREAM_ERROR = "NO_INPUT_STREAM_ERROR"; - public static final String SET_RESPONSE_HEADERS_INFO = "SET_RESPONSE_HEADERS_INFO"; - public static final String BUILD_RESOURCE_INFO = "BUILD_RESOURCE_INFO"; - public static final String NO_RESOURCE_REGISTERED_ERROR = "NO_RESOURCE_REGISTERED_ERROR"; - public static final String NO_RESOURCE_REGISTERED_ERROR_2 = "NO_RESOURCE_REGISTERED_ERROR_2"; - public static final String NO_RESOURCE_EXISTS_ERROR = "NO_RESOURCE_EXISTS_ERROR"; - public static final String INSTANTIATE_RESOURCE_ERROR = "INSTANTIATE_RESOURCE_ERROR"; - public static final String INSTANTIATE_CLASS_ERROR = "INSTANTIATE_CLASS_ERROR"; - public static final String STATIC_RESOURCE_NOT_FOUND_ERROR = "STATIC_RESOURCE_NOT_FOUND_ERROR"; - public static final String PARSING_IF_MODIFIED_SINCE_WARNING = "PARSING_IF_MODIFIED_SINCE_WARNING"; - public static final String GET_CONTENT_FROM_CACHE_INFO = "GET_CONTENT_FROM_CACHE_INFO"; - public static final String CONTENT_NOT_FOUND_ERROR = "CONTENT_NOT_FOUND_ERROR"; - public static final String SEND_RESOURCE_ERROR = "SEND_RESOURCE_ERROR"; - public static final String SEND_RESOURCE_ERROR_2 = "SEND_RESOURCE_ERROR_2"; - public static final String READING_PROPERTIES_ERROR = "READING_PROPERTIES_ERROR"; - public static final String SEND_IMAGE_ERROR = "SEND_IMAGE_ERROR"; - public static final String SEND_IMAGE_ERROR_2 = "SEND_IMAGE_ERROR_2"; - public static final String SKIP_ENCODE_BEGIN_HTML_INFO_2 = "SKIP_ENCODE_BEGIN_HTML_INFO_2"; - public static final String MARK_AS_RENDERED_INFO = "MARK_AS_RENDERED_INFO"; - public static final String SKIP_ENCODE_END_HTML_INFO_2 = "SKIP_ENCODE_END_HTML_INFO_2"; - public static final String VARIABLE_SUBSTITUTION_ERROR = "VARIABLE_SUBSTITUTION_ERROR"; - public static final String SET_SKIN_FACTORY_INFO = "SET_SKIN_FACTORY_INFO"; - public static final String CREATING_SKIN_FACTORY_ERROR = "CREATING_SKIN_FACTORY_ERROR"; - public static final String NULL_SKIN_NAME_ERROR = "NULL_SKIN_NAME_ERROR"; - public static final String CREATE_SKIN_INFO = "CREATE_SKIN_INFO"; - public static final String DEFAULT_PROPERTIES_NOT_FOUND_ERROR = "DEFAULT_PROPERTIES_NOT_FOUND_ERROR"; - public static final String SKIN_PROPERTIES_IO_ERROR = "SKIN_PROPERTIES_IO_ERROR"; - public static final String SKIN_NOT_FOUND_ERROR = "SKIN_NOT_FOUND_ERROR"; - public static final String ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR = "ACESSING_SKIN_PROPERTY_AS_ARRAY_ERROR"; - public static final String ACESSING_SKIN_PROPERTY_ERROR = "ACESSING_SKIN_PROPERTY_ERROR"; - public static final String SKIN_PROPERTIES_READ_ONLY_ERROR = "SKIN_PROPERTIES_READ_ONLY_ERROR"; - public static final String NO_DATA_ADAPTOR = "NO_DATA_ADAPTOR"; - public static final String NO_VALUE_HOLDER_ERROR = "NO_VALUE_HOLDER_ERROR"; - public static final String NO_EDITABLE_VALUE_HOLDER_ERROR = "NO_EDITABLE_VALUE_HOLDER_ERROR"; - public static final String INVALID_VALIDATION_EXPRESSION = "INVALID_VALIDATION_EXPRESSION"; - public static final String NO_ACTION_SOURCE_ERROR = "NO_ACTION_SOURCE_ERROR"; - public static final String NO_ACTION_SOURCE2_ERROR = "NO_ACTION_SOURCE2_ERROR"; - public static final String INVALID_ACTION_LISTENER = "INVALID_ACTION_LISTENER"; - public static final String INVALID_VALUE_CHANGE_LISTENER = "INVALID_VALUE_CHANGE_LISTENER"; - public static final String NO_VALUE_REFERENCE_ERROR = "NO_VALUE_REFERENCE_ERROR"; - public static final String NO_BYTE_ARRAY_ERROR = "NO_BYTE_ARRAY_ERROR"; - public static final String BUFFER_TYPE_ERROR = "BUFFER_TYPE_ERROR"; - public static final String IMAGE_ERROR = "IMAGE_ERROR"; - public static final String CANNOT_WRITE_RASTERS = "CANNOT_WRITE_RASTERS"; - public static final String NULL_OUTPUT_ERROR = "NULL_OUTPUT_ERROR"; - public static final String IMAGE_NOT_BUFFERED_ERROR = "IMAGE_NOT_BUFFERED_ERROR"; - public static final String NOT_DATA_OUTPUT_ERROR = "NOT_DATA_OUTPUT_ERROR"; - public static final String NULL_COLOR_PARAMETER_ERROR = "NULL_COLOR_PARAMETER_ERROR"; - public static final String DECODE_COLOR_PARAMETER_ERROR = "DECODE_COLOR_PARAMETER_ERROR"; - public static final String NULL_COLOR_PARAMETER_ERROR_2 = "NULL_COLOR_PARAMETER_ERROR_2"; - public static final String DECODE_PARAMETER_ERROR = "DECODE_PARAMETER_ERROR"; - public static final String IMAGE_GENERATOR_CLASS_NOT_FOUND = "IMAGE_GENERATOR_CLASS_NOT_FOUND"; - public static final String CREATING_IMAGE_GENERATOR_ERROR = "CREATING_IMAGE_GENERATOR_ERROR"; - public static final String INVALID_COMMENT_INDEX = "INVALID_COMMENT_INDEX"; - public static final String LOADING_IMAGE_ERROR = "LOADING_IMAGE_ERROR"; - public static final String NOT_INDEXED_IMAGE_ERROR = "NOT_INDEXED_IMAGE_ERROR"; - public static final String INVALID_RADIUS = "INVALID_RADIUS"; - public static final String INVALID_ATTRIBUTE_VALUE = "INVALID_ATTRIBUTE_VALUE"; - public static final String VALUE_BINDING_TYPE_ERROR = "VALUE_BINDING_TYPE_ERROR"; - public static final String NO_CONVERTER_FOUND_ERROR = "NO_CONVERTER_FOUND_ERROR"; - public static final String GRABBER_ERROR = "GRABBER_ERROR"; - public static final String TOOMANY_COLORS_ERROR = "TOOMANY_COLORS_ERROR"; - public static final String GET_RESOURCE_AS_STREAM_ERROR = "GET_RESOURCE_AS_STREAM_ERROR"; - public static final String PARSING_WEB_XML_IO_ERROR = "PARSING_WEB_XML_IO_ERROR"; - public static final String PARSING_WEB_XML_SAX_ERROR = "PARSING_WEB_XML_SAX_ERROR"; - public static final String NULL_FILTER_NAME_WARNING = "NULL_FILTER_NAME_WARNING"; - public static final String FILTER_NOT_FOUND_ERROR = "FILTER_NOT_FOUND_ERROR"; - public static final String FILTER_NOT_CONFIGURED_ERROR = "FILTER_NOT_CONFIGURED_ERROR"; - public static final String NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR = "NO_PREFIX_OR_SUFFIX_IN_FILTER_MAPPING_ERROR"; - public static final String CONFIG_INITIALIZATION_ERROR = "CONFIG_INITIALIZATION_ERROR"; - public static final String FIELD_READING_ERROR = "FIELD_READING_ERROR"; - public static final String CONFIG_INITIALIZATION_ERROR_2 = "CONFIG_INITIALIZATION_ERROR_2"; - public static final String DOM_METHOD_NOT_SUPPORTED = "DOM_METHOD_NOT_SUPPORTED"; - public static final String METHOD_NOT_SUPPORTED = "METHOD_NOT_SUPPORTED"; - public static final String NAMED_ITEM_NOT_FOUND_ERROR = "NAMED_ITEM_NOT_FOUND_ERROR"; - public static final String AJAX_SUPPORT_REQUEST_PARAMETER_INFO = "AJAX_SUPPORT_REQUEST_PARAMETER_INFO"; - public static final String COMMAND_LINK_SUBMIT_INFO = "COMMAND_LINK_SUBMIT_INFO"; - public static final String COMMAND_LINK_NOT_IN_FORM_WARNING = "COMMAND_LINK_NOT_IN_FORM_WARNING"; - public static final String MUST_BE_EXPRESSION_ERROR = "MUST_BE_EXPRESSION_ERROR"; - public static final String NOT_PARENT_AJAX_CONTAINER_ERROR = "NOT_PARENT_AJAX_CONTAINER_ERROR"; - public static final String MUST_BE_LITERAL_ERROR = "MUST_BE_LITERAL_ERROR"; - public static final String FACET_TAG_MANY_CHILDREN_ERROR = "FACET_TAG_MANY_CHILDREN_ERROR"; - public static final String NO_UI_COMPONENT_TAG_ANCESTOR_ERROR = "NO_UI_COMPONENT_TAG_ANCESTOR_ERROR"; - public static final String NO_VALUE_REFERENCE_ERROR_2 = "NO_VALUE_REFERENCE_ERROR_2"; - public static final String NULL_TYPE_ATTRIBUTE_ERROR = "NULL_TYPE_ATTRIBUTE_ERROR"; - public static final String NULL_ATTRIBUTE_ERROR = "NULL_ATTRIBUTE_ERROR"; - public static final String AJAX_VIEW_EXPIRED = "AJAX_VIEW_EXPIRED"; - public static final String SKIN_CYCLIC_REFERENCE = "SKIN_CYCLIC_REFERENCE"; - public static final String SKIN_ILLEGAL_REFERENCE = "SKIN_ILLEGAL_REFERENCE"; - public static final String NAME_MUST_BE_LITERAL = "NAME_MUST_BE_LITERAL"; - public static final String INSTANTIATE_LISTENER_ERROR = "INSTANTIATE_LISTENER_ERROR"; - public static final String NOT_AJAX_CONTAINER_ERROR = "NOT_AJAX_CONTAINER_ERROR"; - public static final String INVALID_EXPRESSION = "INVALID_EXPRESSION"; - public static final String NOT_INSTANCE_OF_ERROR = "NOT_INSTANCE_OF_ERROR"; - public static final String UNSUPPORTED_ENCODING_ERROR = "UNSUPPORTED_ENCODING_ERROR"; - public static final String UNSUPPORTED_INPUT_SOURCE_ERROR = "UNSUPPORTED_INPUT_SOURCE_ERROR"; - public static final String STRING_CONVERSION_ERROR = "STRING_CONVERSION_ERROR"; - public static final String UTF_CONVERSION_ERROR = "UTF_CONVERSION_ERROR"; - public static final String READ_ONLY_NODE_ERROR = "READ_ONLY_NODE_ERROR"; - public static final String NOT_PARENT_AJAX_COMPONENT_ERROR = "NOT_PARENT_AJAX_COMPONENT_ERROR"; - public static final String INVALID_VALUE = "INVALID_VALUE"; - public static final String DATASCROLLER_PAGE_MISSING = "DATASCROLLER_PAGE_MISSING"; - - public static void main(String[] args) { - String m = getMessage(INVALID_ATTRIBUTE_VALUE, "A", "B"); - System.out.println(m); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodBindingToMethodExpression.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,344 +0,0 @@ -/* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.seam.ui.util.cdk; - -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.MethodExpression; -import javax.el.MethodInfo; -import javax.el.MethodNotFoundException; -import javax.el.PropertyNotFoundException; -import javax.faces.FacesException; -import javax.faces.component.StateHolder; -import javax.faces.context.FacesContext; -import javax.faces.el.EvaluationException; -import javax.faces.el.MethodBinding; - -/** - * Converts a MethodBinding to a MethodExpression - * - * - * @author Stan Silvert - * @author Pete Muir - */ -@SuppressWarnings("deprecation") -public class MethodBindingToMethodExpression extends MethodExpression implements StateHolder -{ - private static final Class[] EXPECTED_TYPES = new Class[] { MethodBinding.class, StateHolder.class }; - - private MethodBinding methodBinding; - - private boolean _transientFlag; - - private transient MethodInfo methodInfo; - - /** - * No-arg constructor used during restoreState - */ - protected MethodBindingToMethodExpression() - { - } - - /** Creates a new instance of MethodBindingToMethodExpression */ - public MethodBindingToMethodExpression(MethodBinding methodBinding) - { - checkNullArgument(methodBinding, "methodBinding"); - this.methodBinding = methodBinding; - } - - /** - * Return the wrapped MethodBinding. - */ - public MethodBinding getMethodBinding() - { - return methodBinding; - } - - void setMethodBinding(MethodBinding methodBinding) - { - this.methodBinding = methodBinding; - } - - /** - * Note: MethodInfo.getParamTypes() may incorrectly return an empty class array if invoke() has not been called. - * - * @throws IllegalStateException - * if expected params types have not been determined. - */ - @Override - public MethodInfo getMethodInfo(ELContext context) throws PropertyNotFoundException, MethodNotFoundException, - ELException - { - checkNullArgument(context, "elcontext"); - checkNullState(methodBinding, "methodBinding"); - - if (methodInfo == null) - { - final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class); - if (facesContext != null) - { - methodInfo = invoke(new Invoker<MethodInfo>() - { - public MethodInfo invoke() - { - return new MethodInfo(null, methodBinding.getType(facesContext), null); - } - }); - } - } - return methodInfo; - } - - @Override - public Object invoke(ELContext context, final Object[] params) throws PropertyNotFoundException, - MethodNotFoundException, ELException - { - checkNullArgument(context, "elcontext"); - checkNullState(methodBinding, "methodBinding"); - final FacesContext facesContext = (FacesContext) context.getContext(FacesContext.class); - if (facesContext != null) - { - return invoke(new Invoker<Object>() - { - public Object invoke() - { - return methodBinding.invoke(facesContext, params); - } - }); - } - return null; - } - - @Override - public boolean isLiteralText() - { - if (methodBinding == null) - throw new IllegalStateException("methodBinding is null"); - String expr = methodBinding.getExpressionString(); - return !(expr.startsWith("#{") && expr.endsWith("}")); - } - - @Override - public String getExpressionString() - { - return methodBinding.getExpressionString(); - } - - public Object saveState(FacesContext context) - { - if (!isTransient()) - { - if (methodBinding instanceof StateHolder) - { - Object[] state = new Object[2]; - state[0] = methodBinding.getClass().getName(); - state[1] = ((StateHolder) methodBinding).saveState(context); - return state; - } - else - { - return methodBinding; - } - } - return null; - } - - public void restoreState(FacesContext context, Object state) - { - if (state instanceof MethodBinding) - { - methodBinding = (MethodBinding) state; - methodInfo = null; - } - else if (state != null) - { - Object[] values = (Object[]) state; - methodBinding = (MethodBinding) newInstance(values[0].toString(), EXPECTED_TYPES); - ((StateHolder) methodBinding).restoreState(context, values[1]); - methodInfo = null; - } - } - - public void setTransient(boolean transientFlag) - { - _transientFlag = transientFlag; - } - - public boolean isTransient() - { - return _transientFlag; - } - - @Override - public int hashCode() - { - final int PRIME = 31; - int result = 1; - result = PRIME * result + ((methodBinding == null) ? 0 : methodBinding.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final MethodBindingToMethodExpression other = (MethodBindingToMethodExpression) obj; - if (methodBinding == null) - { - if (other.methodBinding != null) - return false; - } - else if (!methodBinding.equals(other.methodBinding)) - return false; - return true; - } - - private void checkNullState(Object notNullInstance, String instanceName) - { - if (notNullInstance == null) - throw new IllegalStateException(instanceName + " is null"); - } - - private void checkNullArgument(Object notNullInstance, String instanceName) - { - if (notNullInstance == null) - throw new IllegalArgumentException(instanceName + " is null"); - } - - private <T> T invoke(Invoker<T> invoker) - { - try - { - return invoker.invoke(); - } - catch (javax.faces.el.MethodNotFoundException e) - { - throw new MethodNotFoundException(e.getMessage(), e); - } - catch (EvaluationException e) - { - throw new ELException(e.getMessage(), e); - } - } - - private interface Invoker<T> - { - T invoke(); - } - - private static Object newInstance(String type, Class[] expectedTypes) - { - if (type == null) - return null; - - Class clazzForName = simpleClassForName(type); - - if(expectedTypes != null) - { - for (int i = 0, size = expectedTypes.length; i < size; i++) - { - if (!expectedTypes[i].isAssignableFrom(clazzForName)) - { - throw new FacesException("'" + type + "' does not implement expected type '" + expectedTypes[i] - + "'"); - } - } - } - - return newInstance(clazzForName); - } - - private static Object newInstance(Class clazz) - throws FacesException - { - try - { - return clazz.newInstance(); - } - catch(NoClassDefFoundError e) - { - throw new FacesException(e); - } - catch (InstantiationException e) - { - throw new FacesException(e); - } - catch (IllegalAccessException e) - { - throw new FacesException(e); - } - } - - /** - * Tries a Class.loadClass with the context class loader of the current thread first and - * automatically falls back to the ClassUtils class loader (i.e. the loader of the - * myfaces.jar lib) if necessary. - * - * @param type fully qualified name of a non-primitive non-array class - * @return the corresponding Class - * @throws NullPointerException if type is null - * @throws ClassNotFoundException - */ - private static Class classForName(String type) - throws ClassNotFoundException - { - if (type == null) throw new NullPointerException("type"); - try - { - // Try WebApp ClassLoader first - return Class.forName(type, - false, // do not initialize for faster startup - Thread.currentThread().getContextClassLoader()); - } - catch (ClassNotFoundException ignore) - { - // fallback: Try ClassLoader for ClassUtils (i.e. the myfaces.jar lib) - return Class.forName(type, - false, // do not initialize for faster startup - MethodBindingToMethodExpression.class.getClassLoader()); - } - } - - - /** - * Same as {@link #classForName(String)}, but throws a RuntimeException - * (FacesException) instead of a ClassNotFoundException. - * - * @return the corresponding Class - * @throws NullPointerException if type is null - * @throws FacesException if class not found - */ - private static Class simpleClassForName(String type) - { - try - { - return classForName(type); - } - catch (ClassNotFoundException e) - { - throw new FacesException(e); - } - } - - - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodExpressionToMethodBinding.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodExpressionToMethodBinding.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/MethodExpressionToMethodBinding.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,103 +0,0 @@ -/* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.seam.ui.util.cdk; - -import javax.el.ELException; -import javax.el.MethodExpression; -import javax.faces.component.StateHolder; -import javax.faces.context.FacesContext; -import javax.faces.el.EvaluationException; -import javax.faces.el.MethodBinding; -import javax.faces.el.MethodNotFoundException; - -/** - * Converts a MethodExpression to a MethodBinding. - * See JSF 1.2 spec section 5.8.4 - * - * @author Stan Silvert - * @author Pete Muir - */ -@Deprecated -public class MethodExpressionToMethodBinding extends MethodBinding implements StateHolder { - - private MethodExpression methodExpression; - - private boolean isTransient = false; - - public MethodExpressionToMethodBinding() { - methodExpression = null; - } - - /** Creates a new instance of MethodExpressionToMethodBinding */ - public MethodExpressionToMethodBinding(MethodExpression methodExpression) { - this.methodExpression = methodExpression; - } - - @Override - public String getExpressionString() - { - return methodExpression.getExpressionString(); - } - - @Override - public Class getType(FacesContext facesContext) - throws MethodNotFoundException { - - try { - return methodExpression.getMethodInfo(facesContext.getELContext()).getReturnType(); - } catch (javax.el.MethodNotFoundException e) { - throw new javax.faces.el.MethodNotFoundException(e); - } catch (ELException e) { - throw new EvaluationException(e); - } - } - - @Override - public Object invoke(FacesContext facesContext, Object[] params) - throws EvaluationException, MethodNotFoundException { - - try { - return methodExpression.invoke(facesContext.getELContext(), params); - } catch (javax.el.MethodNotFoundException e) { - throw new javax.faces.el.MethodNotFoundException(e); - } catch (ELException e) { - throw new EvaluationException(e); - } - } - -// -------- StateHolder methods ------------------------------------------- - - public void restoreState(FacesContext context, Object state) { - if(state != null) - methodExpression = (MethodExpression)state; - } - - public Object saveState(FacesContext context) { - if(!isTransient) - return methodExpression; - return null; - } - - public void setTransient(boolean newTransientValue) { - isTransient = newTransientValue; - } - - public boolean isTransient() { - return isTransient; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,198 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.util.cdk; - -import java.io.IOException; -import java.util.Iterator; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.Renderer; - - -/** - * Mangled version of Ajax4Jsf's RendererBase without supporting classes - * - * Base Renderer for all chameleon Skin's and components. - * At most, make all common procedures and realise concrete work in "template" methods. - * @author asmirnov(a)exadel.com (latest modification by $Author: gavin $) - * @version $Revision: 5308 $ $Date: 2007-06-20 04:46:17 +0200 (St, 20 VI 2007) $ - * - */ -public abstract class RendererBase extends Renderer { - - /** - * logger for common cases. - */ - protected static final String JAVASCRIPT_NAMESPACE = "JBossSeam"; - private static final RendererUtils utils = new RendererUtils(); - - @Override - public void decode(FacesContext context, UIComponent component) { - // Test for correct parameters. - if (context == null) throw new NullPointerException("Context must not be null"); - if (component == null) throw new NullPointerException("Component must not be null"); - if (! getComponentClass().isInstance(component)) throw new IllegalArgumentException("Component must be of type " + getComponentClass().getName()); - preDecode(context,component); - // TODO - create set od common decoders ( UIInput, ActionSource etc. ) for process decoding. - if (component.isRendered()) { - doDecode(context, component); - } - } - - protected void preDecode(FacesContext context, UIComponent component) { - } - - protected void preEncodeBegin(FacesContext context, UIComponent component) throws IOException { - - } - - @Override - public void encodeBegin(FacesContext context, UIComponent component) throws IOException { - // Test for correct parameters. - if (context == null) throw new NullPointerException("Context must not be null"); - if (component == null) throw new NullPointerException("Component must not be null"); - if (! getComponentClass().isInstance(component)) throw new IllegalArgumentException("Component must be of type " + getComponentClass().getName()); - preEncodeBegin(context,component); - if (component.isRendered()) { - ResponseWriter writer = context.getResponseWriter(); - doEncodeBegin(writer, context, component); - } - } - - @Override - public void encodeChildren(FacesContext context, UIComponent component) throws IOException { - // Test for correct parameters. - if (context == null) throw new NullPointerException("Context must not be null"); - if (component == null) throw new NullPointerException("Component must not be null"); - if (! getComponentClass().isInstance(component)) throw new IllegalArgumentException("Component must be of type " + getComponentClass().getName()); - preEncodeBegin(context,component); - if (component.isRendered()) { - ResponseWriter writer = context.getResponseWriter(); - doEncodeChildren(writer, context, component); - } - } - - @Override - public void encodeEnd(FacesContext context, UIComponent component) throws IOException { - // Test for correct parameters. - if (context == null) throw new NullPointerException("Context must not be null"); - if (component == null) throw new NullPointerException("Component must not be null"); - if (! getComponentClass().isInstance(component)) throw new IllegalArgumentException("Component must be of type " + getComponentClass().getName()); - if (component.isRendered()) { - ResponseWriter writer = context.getResponseWriter(); - doEncodeEnd(writer, context, component); - } - } - - /** - * Get base component slass , targetted for this renderer. Used for check arguments in decode/encode. - */ - protected abstract Class getComponentClass(); - - - /** - * Template method for custom decoding of concrete renderer. - * All parameters checking if performed in original decode() method. - * @param context - * @param component - */ - protected void doDecode(FacesContext context, UIComponent component) { - - } - - /** - * Template method for custom start encoding of concrete renderer. - * All parameters checking and writer is performed in original encodeBegin() method. - * @param writer - * @param context - * @param component - */ - protected void doEncodeBegin(ResponseWriter writer,FacesContext context, UIComponent component) throws IOException { - - } - /** - * @param writer - * @param context - * @param component - */ - protected void doEncodeChildren(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - // Hook method, must be overriden in renderers with special children processing - } - - /** - * Template method for custom finish encoding of concrete renderer. - * All parameters checking and writer is performed in original encodeEnd() method. - * @param writer - * @param context - * @param component - * @throws IOException - */ - protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { - - } - - /** - * Render all children for given component. - * @param facesContext - * @param component - * @throws IOException - */ - public void renderChildren(FacesContext facesContext, - UIComponent component) throws IOException { - if (component.getChildCount() > 0) { - for (Iterator it = component.getChildren().iterator(); it.hasNext();) { - UIComponent child = (UIComponent) it.next(); - renderChild(facesContext, child); - } - } - } - - - /** - * Render one component and it childrens - * @param facesContext - * @param child - * @throws IOException - */ - public void renderChild(FacesContext facesContext, UIComponent child) - throws IOException { - if (!child.isRendered()) { - return; - } - - child.encodeBegin(facesContext); - if (child.getRendersChildren()) { - child.encodeChildren(facesContext); - } else { - renderChildren(facesContext, child); - } - child.encodeEnd(facesContext); - } - - public static RendererUtils getUtils() - { - return utils; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererUtils.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererUtils.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/RendererUtils.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,79 +0,0 @@ -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package org.jboss.seam.ui.util.cdk; - -import static org.jboss.seam.util.Reflections.isInstanceOf; - -import javax.faces.component.UIComponent; -import javax.faces.component.UIForm; -import javax.faces.component.html.HtmlCommandButton; - - -public class RendererUtils -{ - - private static final String TRINIDAD_FORM_FAMILY = "org.apache.myfaces.trinidad.Form"; - private static final String TRINIDAD_COMMANDBUTTON_CLASS = "org.apache.myfaces.trinidad.component.core.nav.CoreCommandButton"; - private static final String RICHFACES_COMMANDBUTTON_CLASS = "org.ajax4jsf.component.UIAjaxCommandButton"; - - /** - * Since Trinidad, and possibly other JSF implementations don't always subclass - * from {@link javax.faces.component.UIForm} we can't cast to UIForm. - */ - public UIComponent getForm(UIComponent component) - { - while (component != null) - { - if (isForm(component)) - { - break; - } - component = component.getParent(); - } - return component; - } - - public boolean isCommandButton(UIComponent cmp) - { - if ( cmp instanceof HtmlCommandButton || isInstanceOf(cmp.getClass(), TRINIDAD_COMMANDBUTTON_CLASS) || isInstanceOf(cmp.getClass(), RICHFACES_COMMANDBUTTON_CLASS) ) - { - return true; - } - else - { - return false; - } - } - - public boolean isForm(UIComponent cmp) - { - if ( cmp instanceof UIForm || TRINIDAD_FORM_FAMILY.equals(cmp.getFamily()) ) - { - return true; - } - else - { - return false; - } - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/SimpleActionMethodBinding.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/SimpleActionMethodBinding.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/SimpleActionMethodBinding.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,98 +0,0 @@ -package org.jboss.seam.ui.util.cdk; - -/** - * License Agreement. - * - * Ajax4jsf 1.1 - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -import javax.faces.component.StateHolder; -import javax.faces.context.FacesContext; -import javax.faces.el.EvaluationException; -import javax.faces.el.MethodBinding; -import javax.faces.el.MethodNotFoundException; - -/** - * Simple method binding for constant action outcome. - * @author asmirnov(a)exadel.com (latest modification by $Author: pmuir $) - * - */ -@Deprecated -public class SimpleActionMethodBinding extends MethodBinding implements StateHolder { - // private static final Log log = - // LogFactory.getLog(SimpleActionMethodBinding.class); - - private String _outcome; - - public SimpleActionMethodBinding(String outcome) { - _outcome = outcome; - } - - @Override - public Object invoke(FacesContext facescontext, Object aobj[]) - throws EvaluationException, MethodNotFoundException { - return _outcome; - } - - @Override - public Class getType(FacesContext facescontext) - throws MethodNotFoundException { - return String.class; - } - - // ~ StateHolder support - // ---------------------------------------------------------------------------- - - private boolean _transient = false; - - /** - * Empty constructor, so that new instances can be created when restoring - * state. - */ - public SimpleActionMethodBinding() { - _outcome = null; - } - - public Object saveState(FacesContext facescontext) { - return _outcome; - } - - public void restoreState(FacesContext facescontext, Object obj) { - _outcome = (String) obj; - } - - public boolean isTransient() { - return _transient; - } - - public void setTransient(boolean flag) { - _transient = flag; - } - - @Override - public String toString() { - return _outcome; - } - - @Override - public String getExpressionString() - { - return _outcome; - } -} - Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentELTagBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,87 +0,0 @@ -package org.jboss.seam.ui.util.cdk; - -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.faces.component.ActionSource2; -import javax.faces.component.EditableValueHolder; -import javax.faces.component.UIComponent; -import javax.faces.component.ValueHolder; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.event.MethodExpressionActionListener; -import javax.faces.event.MethodExpressionValueChangeListener; -import javax.faces.validator.MethodExpressionValidator; -import javax.faces.webapp.UIComponentELTag; - -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; - -/** - * @author Maksim Kaszynski - * - */ -public abstract class UIComponentELTagBase extends UIComponentELTag { - - private static final LogProvider log = Logging.getLogProvider(UIComponentELTagBase.class); - - protected void setActionListenerProperty(UIComponent component, MethodExpression actionListener) { - if (actionListener != null) { - if (component instanceof ActionSource2) { - ActionSource2 actionSource2 = (ActionSource2) component; - actionSource2.addActionListener(new MethodExpressionActionListener(actionListener)); - } else { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR, component.getClientId(getFacesContext()))); - } - } - } - - protected void setActionProperty(UIComponent component, MethodExpression action) { - if (action != null) { - if (component instanceof ActionSource2) { - ActionSource2 actionSource2 = (ActionSource2) component; - actionSource2.setActionExpression(action); - } else { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_ACTION_SOURCE2_ERROR, component.getClientId(getFacesContext()))); - } - } - } - - protected void setConverterProperty(UIComponent component, ValueExpression converter) { - if (converter != null) { - if (component instanceof ValueHolder) { - ValueHolder output = (ValueHolder) component; - if (!converter.isLiteralText()) { - component.setValueExpression("converter", converter); - } else { - Converter conv = FacesContext.getCurrentInstance().getApplication().createConverter(converter.getExpressionString()); - output.setConverter(conv); - } - } else { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_VALUE_HOLDER_ERROR, component.getClass().getName())); - } - } - } - - protected void setValidatorProperty(UIComponent component, MethodExpression validator) { - - if (validator != null) { - if (component instanceof EditableValueHolder) { - EditableValueHolder input = (EditableValueHolder) component; - input.addValidator(new MethodExpressionValidator(validator)); - } else { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); - } - } - } - - protected void setValueChangeListenerProperty(UIComponent component, MethodExpression valueChangeListener) { - if (valueChangeListener != null) { - if (component instanceof EditableValueHolder) { - EditableValueHolder input = (EditableValueHolder) component; - input.addValueChangeListener(new MethodExpressionValueChangeListener(valueChangeListener)); - } else { - throw new IllegalArgumentException(Messages.getMessage(Messages.NO_EDITABLE_VALUE_HOLDER_ERROR, component.getId())); - } - } - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/util/cdk/UIComponentTagBase.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,167 +0,0 @@ -/** - * - */ -package org.jboss.seam.ui.util.cdk; - -import javax.el.ExpressionFactory; -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.faces.component.UICommand; -import javax.faces.component.UIComponent; -import javax.faces.component.UIGraphic; -import javax.faces.component.UIParameter; -import javax.faces.component.UISelectBoolean; -import javax.faces.component.ValueHolder; -import javax.faces.event.ActionEvent; -import javax.faces.event.ValueChangeEvent; - -/** - * @author Maksim Kaszynski - * - */ -public abstract class UIComponentTagBase extends UIComponentELTagBase { - - protected ExpressionFactory getExpressionFactory() { - return getFacesContext().getApplication().getExpressionFactory(); - } - - protected void setProperty(UIComponent component, String propName, ValueExpression valueExpression) { - if (valueExpression != null) { - if (valueExpression.isLiteralText()) { - component.getAttributes().put(propName,valueExpression.getValue(getELContext())); - } else { - component.setValueExpression(propName, valueExpression); - } - } - } - - protected void setProperty(UIComponent component, Class<?> type, - String propName, String value) { - if (value != null) { - ValueExpression valueExpression = getExpressionFactory() - .createValueExpression(getELContext(), value, type); - setProperty(component, propName, valueExpression); - } - } - - protected void setIntegerProperty(UIComponent component, String propName, - ValueExpression value) { - setProperty(component, propName, value); - } - - protected void setLongProperty(UIComponent component, String propName, - ValueExpression value) { - setProperty(component, propName, value); - } - - protected void setFloatProperty(UIComponent component, String propName, - ValueExpression value) { - setProperty(component, propName, value); - } - - protected void setDoubleProperty(UIComponent component, String propName, - ValueExpression value) { - setProperty(component, propName, value); - } - - protected void setStringProperty(UIComponent component, String propName, - ValueExpression value) { - setProperty(component, propName, value); - } - - protected void setBooleanProperty(UIComponent component, String propName, - ValueExpression value) { - setProperty(component, propName, value); - } - - protected void setIntegerProperty(UIComponent component, String propName, - String value) { - setProperty(component, Integer.class, propName, value); - } - - protected void setLongProperty(UIComponent component, String propName, - String value) { - setProperty(component, Long.class, propName, value); - } - - protected void setFloatProperty(UIComponent component, String propName, - String value) { - setProperty(component, Float.class, propName, value); - } - - protected void setDoubleProperty(UIComponent component, String propName, - String value) { - setProperty(component, Double.class, propName, value); - } - - protected void setStringProperty(UIComponent component, String propName, - String value) { - setProperty(component, String.class, propName, value); - } - - protected void setBooleanProperty(UIComponent component, String propName, - String value) { - setProperty(component, Boolean.class, propName, value); - } - protected void setValueProperty(UIComponent component, String value) { - if (value != null) { - ValueExpression expression = getExpressionFactory() - .createValueExpression(getELContext(), value, Object.class); - - setValueProperty(component, expression); - } - } - protected void setValueProperty(UIComponent component, ValueExpression expression) { - if (expression != null) { - String value = expression.getExpressionString(); - if (!expression.isLiteralText()) { - component.setValueExpression("value", expression); - } else if (component instanceof UICommand) { - ((UICommand) component).setValue(value); - } else if (component instanceof UIParameter) { - ((UIParameter) component).setValue(value); - } else if (component instanceof UISelectBoolean) { - ((UISelectBoolean) component).setValue(Boolean.valueOf(value)); - } else if (component instanceof UIGraphic) { - ((UIGraphic) component).setValue(value); - } - // Since many input components are ValueHolders the special - // components - // must come first, ValueHolder is the last resort. - else if (component instanceof ValueHolder) { - ((ValueHolder) component).setValue(value); - } else { - component.getAttributes().put("value", value); - } - } - } - - public boolean isValueReference(String s) { - return !getExpressionFactory().createValueExpression(s, Object.class).isLiteralText(); - } - - protected void setActionProperty(UIComponent component, String action) { - if (action != null) { - MethodExpression expression = - getExpressionFactory().createMethodExpression(getELContext(), action, String.class, new Class[] {}); - setActionProperty(component, expression); - } - } - - protected void setActionListenerProperty(UIComponent component, String actionListener){ - if (actionListener != null) { - MethodExpression expression = - getExpressionFactory().createMethodExpression(getELContext(), actionListener, String.class, new Class[] {ActionEvent.class}); - setActionListenerProperty(component, expression); - } - } - - protected void setValueChangedListenerProperty(UIComponent component, String valueChangedListener) { - if (valueChangedListener != null) { - MethodExpression expression = - getExpressionFactory().createMethodExpression(getELContext(), valueChangedListener, String.class, new Class[] {ValueChangeEvent.class}); - setValueChangeListenerProperty(component, expression); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/EqualityValidator.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,444 +0,0 @@ -package org.jboss.seam.ui.validator; - -import javax.el.ELException; -import javax.el.ValueExpression; -import javax.faces.FacesException; -import javax.faces.application.Application; -import javax.faces.application.FacesMessage; -import javax.faces.component.EditableValueHolder; -import javax.faces.component.NamingContainer; -import javax.faces.component.StateHolder; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; -import javax.faces.render.Renderer; -import javax.faces.validator.Validator; -import javax.faces.validator.ValidatorException; - -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; -import org.jboss.seam.ui.component.UIDecorate; - -/** - * Validate two fields are equal - * - * @author pmuir - * @author Daniel Roth - * - */ -public class EqualityValidator implements Validator, StateHolder -{ - - private static LogProvider log = Logging.getLogProvider(EqualityValidator.class); - - public static final String MESSAGE_ID = "org.jboss.seam.ui.validator.NOT_EQUAL"; - - public static final String VALIDATOR_ID = "org.jboss.seam.ui.validator.Equality"; - - private enum ValidOperation - { - EQUAL, NOT_EQUAL, GREATER, GREATER_OR_EQUAL, LESS, LESS_OR_EQUAL; - } - - private String forId; - private String message; - private String messageId; - private ValidOperation operator = ValidOperation.EQUAL; // Default - - public EqualityValidator() - { - this.message = "Value does not equal that in '#0'"; - this.messageId = MESSAGE_ID; - } - - public EqualityValidator(String forId) - { - this(); - setFor(forId); - } - - public EqualityValidator(String forId, String message, String messageId, String operator) - { - this(forId); - if (message != null) - { - setMessage(message); - } - if (messageId != null) - { - setMessageId(messageId); - } - if (operator != null && !"".equals(operator)) - { - if (ValidOperation.valueOf(operator.toUpperCase()) != null) - setOperator(ValidOperation.valueOf(operator.toUpperCase())); - else - throw new IllegalStateException("Illegal operator. " + "Supported are: " + validOperatorsAsString()); - } - - } - - private String validOperatorsAsString() - { - StringBuffer buff = new StringBuffer(); - for (ValidOperation op : ValidOperation.values()) - { - buff.append(op.name()).append(" "); - } - return buff.toString(); - } - - public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException - { - if (getFor() == null) - { - throw new FacesException("Must specify a component to validate equality against"); - } - UIComponent otherComponent = findOtherComponent(component); - - Object other = new OtherComponent(context, otherComponent).getValue(); - if (value == null && other == null) - { - // Thats fine - } - else if (value != null) - { - switch (operator) - { - case EQUAL: - if (!value.equals(other)) - { - throwValidationException(value, otherComponent, other); - } - break; - case NOT_EQUAL: - if (value.equals(other)) - { - throwValidationException(value, otherComponent, other); - } - break; - case GREATER: - if (!(compare(value, other) > 0)) - { - throwValidationException(value, otherComponent, other); - } - break; - case GREATER_OR_EQUAL: - if (!(compare(value, other) >= 0)) - { - throwValidationException(value, otherComponent, other); - } - break; - case LESS: - if (!(compare(value, other) < 0)) - { - throwValidationException(value, otherComponent, other); - } - break; - case LESS_OR_EQUAL: - if (!(compare(value, other) <= 0)) - { - throwValidationException(value, otherComponent, other); - } - break; - } - } - } - - private UIComponent findOtherComponent(UIComponent component) - { - UIComponent otherComponent = component.findComponent(getFor()); - - /** - * If s:decorate is used, otherComponent will be null We have to look it - * up ourselves - */ - if (otherComponent == null) - { - UIComponent decorateParent = null; - UIComponent parent = component.getParent(); - while (decorateParent == null && parent != null) - { - if (parent instanceof NamingContainer && !(parent instanceof UIDecorate)) - { - decorateParent = parent; - } - parent = parent.getParent(); - } - if (decorateParent != null) - otherComponent = findChildComponent(decorateParent); - - } - return otherComponent; - } - - private UIComponent findChildComponent(UIComponent parent) - { - UIComponent ret = null; - for (UIComponent child : parent.getChildren()) - { - if (child.getId().equals(getFor())) - ret = child; - else - ret = findChildComponent(child); - if (ret != null) - break; - } - return ret; - - } - - private int compare(Object value, Object other) throws IllegalArgumentException - { - try - { - Comparable c1 = (Comparable) value; - return c1.compareTo(other); - } - catch (Exception e) - { - throw new IllegalArgumentException("Values are not comparable", e); - } - - } - - private void throwValidationException(Object value, UIComponent otherComponent, Object other) - { - throw new ValidatorException(FacesMessages.createFacesMessage(FacesMessage.SEVERITY_ERROR, getMessageId(), getMessage(), otherComponent.getId(), value, other)); - } - - public String getFor() - { - return forId; - } - - public void setFor(String forId) - { - this.forId = forId; - } - - public String getMessage() - { - return message; - } - - public void setMessage(String message) - { - this.message = message; - } - - public String getMessageId() - { - return messageId; - } - - public void setMessageId(String messageId) - { - this.messageId = messageId; - } - - public boolean isTransient() - { - return false; - } - - public void restoreState(FacesContext context, Object state) - { - Object[] fields = (Object[]) state; - forId = (String) fields[0]; - message = (String) fields[1]; - messageId = (String) fields[2]; - operator = ValidOperation.valueOf((String) fields[3]); - } - - public Object saveState(FacesContext context) - { - Object[] state = new Object[4]; - state[0] = forId; - state[1] = message; - state[2] = messageId; - state[3] = operator.toString(); - return state; - } - - public void setTransient(boolean newTransientValue) - { - // No-op - } - - /** - * Simple data structure to hold info on the "other" component - * - * @author pmuir - * - */ - private class OtherComponent - { - - private FacesContext context; - private UIComponent component; - private EditableValueHolder editableValueHolder; - - private Renderer renderer; - private Converter converter; - - public OtherComponent(FacesContext facesContext, UIComponent component) - { - this.component = component; - this.context = facesContext; - if (!(component instanceof EditableValueHolder)) - { - throw new IllegalStateException("forId must reference an EditableValueHolder (\"input\") component"); - } - editableValueHolder = (EditableValueHolder) component; - initRenderer(); - initConverter(); - } - - private void initRenderer() - { - if (renderer == null) - { - String rendererType = component.getRendererType(); - if (rendererType != null) - { - renderer = context.getRenderKit().getRenderer(component.getFamily(), rendererType); - if (null == renderer) - { - log.trace("Can't get Renderer for type " + rendererType); - } - } - else - { - if (log.isTraceEnabled()) - { - String id = component.getId(); - id = (null != id) ? id : component.getClass().getName(); - log.trace("No renderer-type for component " + id); - } - } - } - } - - private void initConverter() - { - converter = editableValueHolder.getConverter(); - if (converter != null) - { - return; - } - - ValueExpression valueExpression = component.getValueExpression("value"); - if (valueExpression == null) - { - return; - } - - Class converterType; - try - { - converterType = valueExpression.getType(context.getELContext()); - } - catch (ELException e) - { - throw new FacesException(e); - } - - // if converterType is null, String, or Object, assume - // no conversion is needed - if (converterType == null || converterType == String.class || converterType == Object.class) - { - return; - } - - // if getType returns a type for which we support a default - // conversion, acquire an appropriate converter instance. - try - { - Application application = context.getApplication(); - converter = application.createConverter(converterType); - } - catch (Exception e) - { - throw new FacesException(e); - } - } - - private Object getConvertedValue(Object newSubmittedValue) throws ConverterException - { - - Object newValue; - - if (renderer != null) - { - newValue = renderer.getConvertedValue(context, component, newSubmittedValue); - } - else if (newSubmittedValue instanceof String) - { - // If there's no Renderer, and we've got a String, run it - // through - // the Converter (if any) - if (converter != null) - { - newValue = converter.getAsObject(context, component, (String) newSubmittedValue); - } - else - { - newValue = newSubmittedValue; - } - } - else - { - newValue = newSubmittedValue; - } - return newValue; - } - - public Object getValue() - { - /** - * If conversion already is done, return value - */ - if (editableValueHolder.isLocalValueSet()) - { - return editableValueHolder.getValue(); - } - - /** - * Convert submittet value - */ - Object submittedValue = editableValueHolder.getLocalValue(); - if (submittedValue == null) - { - return null; - } - - Object newValue = null; - - try - { - newValue = getConvertedValue(submittedValue); - } - catch (ConverterException ce) - { - // Any errors will be attached by JSF - return null; - } - - return newValue; - } - - } - - public ValidOperation getOperator() - { - return operator; - } - - public void setOperator(ValidOperation operator) - { - this.operator = operator; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,216 +0,0 @@ -package org.jboss.seam.ui.validator; - -import java.io.Reader; -import java.io.Serializable; -import java.io.StringReader; - -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.ValidatorException; - -import org.jboss.seam.text.SeamTextLexer; -import org.jboss.seam.text.SeamTextParser; - -import antlr.*; - -/** - * Formatted Text validator - * - * Use as a JSF validator on an input control that allows entering Seam Text - * markup. - * <p> - * The Seam Text parser has a disabled default error handler, catch exceptions - * as appropriate if you display Seam Text (see <a - * href="http://www.doc.ic.ac.uk/lab/secondyear/Antlr/err.html">http://www.doc.ic.ac.uk/lab/secondyear/Antlr/err.html</a>) - * and call the static convenience method - * <tt>FormattedTextValidator.getErrorMessage(originalText, recognitionException)</tt> - * if you want to display or log a nice error message. - * </p> - * <p> - * Uses an instance of <tt>SeamTextParser</tt> by default, override if you require - * validation with your customized instance of <tt>SeamTextParser</tt>. - * </p> - * - * @author matthew.drees - * @author Christian Bauer - */ -public class FormattedTextValidator implements javax.faces.validator.Validator, Serializable { - - private static final long serialVersionUID = 1L; - private static final int NUMBER_OF_CONTEXT_CHARS_AFTER = 10; - private static final int NUMBER_OF_CONTEXT_CHARS_BEFORE = 10; - private static final String END_OF_TEXT = "END OF TEXT"; - String firstError; - String firstErrorDetail; - - /** - * Validate the given value as well-formed Seam Text. If there are parse - * errors, throw a ValidatorException including the first parse error. - */ - public void validate(FacesContext context, UIComponent component, - Object value) throws ValidatorException { - firstError = null; - firstErrorDetail = null; - if (value == null) { - return; - } - - if (!(value instanceof String)) { - throw new IllegalArgumentException("Value is not a string: " - + value); - } - String text = (String) value; - SeamTextParser parser = getSeamTextParser(text); - try { - parser.startRule(); - } - // Error handling for ANTLR lexer/parser errors, see - // http://www.doc.ic.ac.uk/lab/secondyear/Antlr/err.html - catch (TokenStreamException tse) { - // Problem with the token input stream - throw new RuntimeException(tse); - } catch (RecognitionException re) { - // A parser error - if (firstError == null) { - firstError = getParserErrorMessage(text, re); - firstErrorDetail = re.getMessage().replace("\uFFFF",END_OF_TEXT); - } - } - - if (firstError != null) { - throw new ValidatorException(new FacesMessage(firstError, firstErrorDetail)); - } - } - - /** - * Override to instantiate a custom <tt>SeamTextLexer</tt> and <tt>SeamTextParser</tt>. - * - * @param text the raw markup text - * @return an instance of <tt>SeamTextParser</tt> - */ - public SeamTextParser getSeamTextParser(String text) { - Reader r = new StringReader(text); - SeamTextLexer lexer = new SeamTextLexer(r); - return new SeamTextParser(lexer); - } - - public String getParserErrorMessage(String originalText, RecognitionException re) { - String parserErrorMsg; - if (NoViableAltException.class.isAssignableFrom(re.getClass())) { - parserErrorMsg = getNoViableAltErrorMessage( - re.getMessage(), - getErrorLocation(originalText, re, getNumberOfCharsBeforeErrorLocation(), getNumberOfCharsAfterErrorLocation()) - ); - } else if (MismatchedTokenException.class.isAssignableFrom(re.getClass())) { - parserErrorMsg = getMismatchedTokenErrorMessage( - re.getMessage(), - getErrorLocation(originalText, re, getNumberOfCharsBeforeErrorLocation(), getNumberOfCharsAfterErrorLocation()) - ); - } else if (SemanticException.class.isAssignableFrom(re.getClass())) { - parserErrorMsg = getSemanticErrorMessage(re.getMessage()); - } else { - parserErrorMsg = re.getMessage(); - } - return parserErrorMsg; - } - - public int getNumberOfCharsBeforeErrorLocation() { - return NUMBER_OF_CONTEXT_CHARS_BEFORE; - } - - public int getNumberOfCharsAfterErrorLocation() { - return NUMBER_OF_CONTEXT_CHARS_AFTER; - } - - /** - * Override (e.g. for i18n) ANTLR parser error messages. - * - * @param originalMessage the ANTLR parser error message of the RecognitionException - * @param location a snippet that indicates the location in the original markup, might be null - * @return a message that is thrown by this validator - */ - public String getNoViableAltErrorMessage(String originalMessage, String location) { - return location != null - ? "Text parsing error at '..." + location.trim() + "...'" - : "Text parsing error, " + originalMessage.replace("\uFFFF",END_OF_TEXT); - } - - /** - * Override (e.g. for i18n) ANTLR parser error messages. - * - * @param originalMessage the ANTLR parser error message of the RecognitionException - * @param location a snippet that indicates the location in the original markup, might be null - * @return a message that is thrown by this validator - */ - public String getMismatchedTokenErrorMessage(String originalMessage, String location) { - return location != null - ? "Text parsing error at '..." + location.trim() + "...'" - : "Text parsing error, " + originalMessage.replace("\uFFFF",END_OF_TEXT); - } - - /** - * Override (e.g. for i18n) ANTLR parser error messages. - * - * @param originalMessage the ANTLR parser error message of the RecognitionException - * @return a message that is thrown by this validator - */ - public String getSemanticErrorMessage(String originalMessage) { - return "Text parsing error, " + originalMessage.replace("\uFFFF",END_OF_TEXT); - } - - /** - * Extracts the error from the <tt>RecognitionException</tt> and generates - * a location of the error by extracting the original text at the exceptions - * line and column. - * - * @param originalText - * the original Seam Text markup as fed into the parser - * @param re - * an ANTLR <tt>RecognitionException</tt> thrown by the parser - * @param charsBefore - * characters before error location included in message - * @param charsAfter - * characters after error location included in message - * @return an error message with some helpful context about where the error - * occured - */ - public static String getErrorLocation(String originalText, RecognitionException re, int charsBefore, int charsAfter) { - - int beginIndex = Math.max(re.getColumn() - 1 - charsBefore, 0); - int endIndex = Math.min(re.getColumn() + charsAfter, originalText.length()); - - String location = null; - - // Avoid IOOBE even if what we show is wrong, we need to figure out why the indexes are off sometimes - if (beginIndex > 0 && beginIndex < endIndex && endIndex > 0 && endIndex < originalText.length()) - location = originalText.substring(beginIndex, endIndex); - - if (location == null) return location; - - // Filter some dangerous characters we do not want in error messages - return location.replace("\n", " ").replace("\r", " ").replace("#{", "# {"); - } - - /** - * Extracts the error from the <tt>RecognitionException</tt> and generates - * a message including the location of the error. - * - * @param originalText - * the original Seam Text markup as fed into the parser - * @param re - * an ANTLR <tt>RecognitionException</tt> thrown by the parser - * @return an error message with some helpful context about where the error - * occured - */ - public static String getErrorMessage(String originalText, RecognitionException re) { - return re.getMessage().replace("\uFFFF",END_OF_TEXT) - + " at '" - + getErrorLocation( - originalText, re, - NUMBER_OF_CONTEXT_CHARS_BEFORE, NUMBER_OF_CONTEXT_CHARS_AFTER - ) - + "'"; - - } -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/java/org/jboss/seam/ui/validator/ModelValidator.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,77 +0,0 @@ -package org.jboss.seam.ui.validator; - -import java.util.Set; - -import javax.el.ELException; -import javax.el.ValueExpression; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.Validator; -import javax.faces.validator.ValidatorException; - -import org.jboss.seam.core.Validators; -import org.jboss.seam.faces.FacesMessages; -import javax.validation.ConstraintViolation; - -/** - * Validates using Hibernate Validator model-based annotations. - * - * @author Gavin King - * @author Jacob Hookom - * - */ -public class ModelValidator implements Validator -{ - - public void validate(FacesContext facesContext, UIComponent component, Object value) - throws ValidatorException - { - ValueExpression valueExpression = component.getValueExpression("value"); - if (valueExpression != null) - { - //TODO: note that this code is duplicated to Param.getValueFromRequest()!! - Set<ConstraintViolation<Object>> invalidValues; - try - { - invalidValues = Validators.instance().validate( valueExpression, facesContext.getELContext(), value ); - } - catch (ELException ele) - { - Throwable cause = ele.getCause(); - if (cause==null) cause = ele; - throw new ValidatorException(createMessage(cause), cause); - } - - if ( invalidValues!=null && invalidValues.size()>0 ) - { - throw new ValidatorException(createMessage(invalidValues, resolveLabel(facesContext, component))); - } - } - } - - private FacesMessage createMessage(Set<ConstraintViolation<Object>> invalidValues, Object label) - { - String message = invalidValues.iterator().next().getMessage(); - return FacesMessages.createFacesMessage(FacesMessage.SEVERITY_ERROR, message, label); - } - - private FacesMessage createMessage(Throwable cause) - { - return new FacesMessage(FacesMessage.SEVERITY_ERROR, "model validation failed:" + cause.getMessage(), null); - } - - private Object resolveLabel(FacesContext facesContext, UIComponent component) { - Object lbl = component.getAttributes().get("label"); - if (lbl == null || (lbl instanceof String && ((String) lbl).length() == 0)) - { - lbl = component.getValueExpression("label"); - } - if (lbl == null) - { - lbl = component.getClientId(facesContext); - } - return lbl; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/javadoc/jdstyle.css =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/javadoc/jdstyle.css 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/javadoc/jdstyle.css 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,117 +0,0 @@ -/* Javadoc style sheet */ - -/* Define colors, fonts and other style attributes here to override the defaults */ - -/* Page background color */ -body { font-family: Arial; - background-color: white; - font-size: 10pt; - } -td { font-family: Arial; - font-size: 10pt; - } -/* Table colors */ -.TableHeadingColor { background: #F4F4F4 } -.TableSubHeadingColor { background: #F4F4F4 } -.TableRowColor { background: #FFFFFF } - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: normal; font-family: Arial } -.FrameHeadingFont { font-size: normal; font-family: Arial } -.FrameItemFont { font-size: normal; font-family: Arial } - -/* Example of smaller, sans-serif font in frames */ -/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#F4F4F4;} -.NavBarCell1Rev { background-color:silver;} - -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} - -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} - -A { - color: #003399; -} - -A:active { - color: #003399; -} - -A:visited { - color: #888888; -} - -P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { - color: #000000; -} - -TD, TH, SPAN { - color: #000000; -} - -BLOCKQUOTE { - margin-right: 0px; -} - - -/*H1, H2, H3, H4, H5, H6 { - color: #000000; - font-weight:500; - margin-top:10px; - padding-top:15px; -} - -H1 { font-size: 150%; } -H2 { font-size: 140%; } -H3 { font-size: 110%; font-weight: bold; } -H4 { font-size: 110%; font-weight: bold;} -H5 { font-size: 100%; font-style: italic; } -H6 { font-size: 100%; font-style: italic; }*/ - -TT { -font-size: 90%; - font-family: "Courier New", Courier, monospace; - color: #000000; -} - -PRE { -font-size: 90%; - padding: 5px; - border-style: solid; - border-width: 1px; - border-color: #CCCCCC; - background-color: #F4F4F4; -} - -UL, OL, LI { - list-style: disc; -} - -HR { - width: 100%; - height: 1px; - background-color: #CCCCCC; - border-width: 0px; - padding: 0px; - color: #CCCCCC; -} - -.variablelist { - padding-top: 10; - padding-bottom:10; - margin:0; -} - -.itemizedlist, UL { - padding-top: 0; - padding-bottom:0; - margin:0; -} - -.term { - font-weight:bold; -} Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/resources/META-INF/components.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/resources/META-INF/components.xml 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/resources/META-INF/components.xml 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.com/products/seam/components" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> - -</components> Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/templates/README =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/templates/README 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/main/templates/README 2012-03-14 17:37:22 UTC (rev 14390) @@ -1 +0,0 @@ -CDK's declarative (template based) renderer should not currently be used as it introduces runtime dependencies on ajax4jsf. \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicBooleanConverterTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicBooleanConverterTest.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicBooleanConverterTest.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,57 +0,0 @@ -package org.jboss.seam.ui.test; - -import java.util.concurrent.atomic.AtomicBoolean; - -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -import org.jboss.seam.ui.converter.AtomicBooleanConverter; -import org.testng.annotations.Test; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; - -/** - * @author Dennis Byrne - */ - -public class AtomicBooleanConverterTest -{ - - @Test - public void testGetAsObject() - { - Converter converter = new AtomicBooleanConverter(); - assertNull(converter.getAsObject(null, null, null)); - assertNull(converter.getAsObject(null, null, "")); - assertNull(converter.getAsObject(null, null, " ")); - assertTrue(((AtomicBoolean) converter.getAsObject(null, null, "true")).get()); - assertTrue(((AtomicBoolean) converter.getAsObject(null, null, "true ")).get()); - assertTrue(((AtomicBoolean) converter.getAsObject(null, null, " true")).get()); - assertFalse(((AtomicBoolean) converter.getAsObject(null, null, "false")).get()); - assertFalse(((AtomicBoolean) converter.getAsObject(null, null, "false ")).get()); - assertFalse(((AtomicBoolean) converter.getAsObject(null, null, " false")).get()); - assertFalse(((AtomicBoolean) converter.getAsObject(null, null, " boom ")).get()); - - } - - @Test - public void testGetAsString() - { - Converter converter = new AtomicBooleanConverter(); - assertEquals("", converter.getAsString(null, null, null)); - assertEquals("", converter.getAsString(null, null, "")); - assertEquals("true", converter.getAsString(null, null, new AtomicBoolean(true))); - assertEquals("false", converter.getAsString(null, null, new AtomicBoolean(false))); - try - { - converter.getAsString(null, null, new Boolean(true)); - fail(); - } - catch (ConverterException c) {} - - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicIntegerConverterTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicIntegerConverterTest.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicIntegerConverterTest.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,61 +0,0 @@ -package org.jboss.seam.ui.test; - -import java.util.concurrent.atomic.AtomicInteger; - -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -import org.jboss.seam.ui.converter.AtomicIntegerConverter; -import org.testng.annotations.Test; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; -import static org.testng.Assert.assertEquals; - -/** - * @author Dennis Byrne - */ - -public class AtomicIntegerConverterTest -{ - - @Test - public void testGetAsObject() - { - Converter converter = new AtomicIntegerConverter(); - assertNull(converter.getAsObject(null, null, null)); - assertNull(converter.getAsObject(null, null, "")); - assertNull(converter.getAsObject(null, null, " ")); - assertTrue(8 == ((AtomicInteger) converter.getAsObject(null, null, " 8")).intValue()); - assertTrue(8 == ((AtomicInteger) converter.getAsObject(null, null, "8 ")).intValue()); - assertTrue(8 == ((AtomicInteger) converter.getAsObject(null, null, "8")).intValue()); - int over = Integer.MAX_VALUE + 1; - assertTrue(over == ((AtomicInteger) converter.getAsObject(null, null, over + "")).intValue()); - int under = Integer.MIN_VALUE - 1; - assertTrue(under == ((AtomicInteger) converter.getAsObject(null, null, under + "")).intValue()); - - try - { - converter.getAsObject(null, null, "NaN"); - fail("should only take numbers"); - } - catch (ConverterException c) { } - } - - @Test - public void testGetAsString() - { - Converter converter = new AtomicIntegerConverter(); - assertEquals("", converter.getAsString(null, null, null)); - assertEquals("", converter.getAsString(null, null, "")); - assertEquals(" ", converter.getAsString(null, null, " ")); - assertEquals("-1", converter.getAsString(null, null, new AtomicInteger(-1))); - try - { - converter.getAsString(null, null, new Integer(0)); - fail("should only take atomic ints"); - } - catch (ConverterException c) { } - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicLongConverterTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicLongConverterTest.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/AtomicLongConverterTest.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,61 +0,0 @@ -package org.jboss.seam.ui.test; - -import java.util.concurrent.atomic.AtomicLong; - -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; - -import org.jboss.seam.ui.converter.AtomicLongConverter; -import org.testng.annotations.Test; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.fail; - -/** - * @author Dennis Byrne - */ - -public class AtomicLongConverterTest -{ - - @Test - public void testGetAsObject() - { - Converter converter = new AtomicLongConverter(); - assertNull(converter.getAsObject(null, null, null)); - assertNull(converter.getAsObject(null, null, "")); - assertNull(converter.getAsObject(null, null, " ")); - assertTrue(8 == ((AtomicLong) converter.getAsObject(null, null, " 8")).longValue()); - assertTrue(8 == ((AtomicLong) converter.getAsObject(null, null, "8 ")).longValue()); - assertTrue(8 == ((AtomicLong) converter.getAsObject(null, null, "8")).longValue()); - long over = Long.MAX_VALUE + 1; - assertTrue(over == ((AtomicLong) converter.getAsObject(null, null, over + "")).longValue()); - long under = Long.MIN_VALUE - 1; - assertTrue(under == ((AtomicLong) converter.getAsObject(null, null, under + "")).longValue()); - try - { - converter.getAsObject(null, null, "NaN"); - fail("should only take numbers"); - } - catch (ConverterException c) { } - - } - - @Test - public void testGetAsString() - { - Converter converter = new AtomicLongConverter(); - assertEquals("", converter.getAsString(null, null, null)); - assertEquals("", converter.getAsString(null, null, "")); - assertEquals(" ", converter.getAsString(null, null, " ")); - assertEquals("-1", converter.getAsString(null, null, new AtomicLong(-1))); - try - { - converter.getAsString(null, null, new Long(0)); - fail("should only take atomic ints"); - } - catch (ConverterException c) { } - } - -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/UrlBuilderTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/UrlBuilderTest.java 2012-03-14 17:35:46 UTC (rev 14389) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/src/test/java/org/jboss/seam/ui/test/UrlBuilderTest.java 2012-03-14 17:37:22 UTC (rev 14390) @@ -1,32 +0,0 @@ -package org.jboss.seam.ui.test; - -import java.io.UnsupportedEncodingException; - -import org.jboss.seam.ui.util.UrlBuilder; -import org.testng.annotations.Test; - -public class UrlBuilderTest -{ - @Test - public void testBaseUrlAlreadyHasParams() throws UnsupportedEncodingException - { - UrlBuilder url = new UrlBuilder("/someurl?arg1=a", "", "UTF8"); - url.addParameter("foo", "bar"); - - String encodedUrl = url.getEncodedUrl(); - - assert "/someurl?arg1=a&foo=bar".equals(encodedUrl); - } - - @Test - public void testParameterOrdering() throws UnsupportedEncodingException - { - UrlBuilder url = new UrlBuilder("/Hotel.seam", "", "UTF-8"); - url.addParameter("hotelId", "5"); - url.addParameter("cid", "10"); - url.addParameter("z", "z"); - url.addParameter("a", "a"); - String encodedUrl = url.getEncodedUrl(); - assert "/Hotel.seam?hotelId=5&cid=10&z=z&a=a".equals(encodedUrl) : "Parameters not properly ordered"; - } -}

14 years

1
0
0 / 0

Seam SVN: r14389 - in branches/community/Seam_2_3: jboss-seam-debug/src/main/java/com/sun/facelets and 9 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:35:46 -0400 (Wed, 14 Mar 2012) New Revision: 14389 Added: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2/ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java Removed: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Introspector.java branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/debug.xhtml branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/faces-config.xml branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/seam.properties branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/DebugRedirect.java branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugPhaseListener.java branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugSerializationProvider.java Modified: branches/community/Seam_2_3/jboss-seam-debug/pom.xml branches/community/Seam_2_3/jboss-seam-debug/src/main/java/com/sun/facelets/StateWriterControl.java branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/Contexts.java branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/faces-config.xml Log: jboss-seam-debug-jsf renamed to jboss-seam-debug Modified: branches/community/Seam_2_3/jboss-seam-debug/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:35:46 UTC (rev 14389) @@ -6,36 +6,18 @@ <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - <name>Seam Debug</name> + <artifactId>jboss-seam-debug-jsf2</artifactId> + <name>Seam Debug for JSF2</name> <dependencies> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> + <artifactId>jboss-seam-jsf2</artifactId> <type>ejb</type> </dependency> - + <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - </dependency> - - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> @@ -47,6 +29,10 @@ <scope>provided</scope> </dependency> + + + + </dependencies> <profiles> @@ -92,6 +78,25 @@ </plugins> </build> </profile> - </profiles> + <profile> + <id>jsf2</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <optional>true</optional> + </dependency> + </dependencies> + </profile> + </profiles> </project> Modified: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/com/sun/facelets/StateWriterControl.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/java/com/sun/facelets/StateWriterControl.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/com/sun/facelets/StateWriterControl.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -13,13 +13,13 @@ * completely initialized). */ public class StateWriterControl { - final static String STATEWRITER_CLASS_NAME = "com.sun.facelets.StateWriter"; + final static String STATEWRITER_CLASS_NAME = "com.sun.faces.facelets.StateWriter"; static Class getStateWriter() { try { return Class.forName(STATEWRITER_CLASS_NAME); } catch (Exception e) { - throw new RuntimeException("Could not load class com.sun.facelets.StateWriter using reflection", e); + throw new RuntimeException("Could not load class com.sun.faces.facelets.StateWriter using reflection", e); } } @@ -30,7 +30,7 @@ constructor.setAccessible(true); constructor.newInstance(writer, 1024); } catch (Exception e) { - throw new RuntimeException("Could not initilise com.sun.facelets.StateWriter using reflection", e); + throw new RuntimeException("Could not initilise com.sun.faces.facelets.StateWriter using reflection", e); } } @@ -42,7 +42,7 @@ Writer w = (Writer) meth.invoke(null); return writer.cloneWithWriter(w); } catch (Exception e) { - throw new RuntimeException("Could not create clone of com.sun.facelets.StateWriter using reflection", e); + throw new RuntimeException("Could not create clone of com.sun.faces.facelets.StateWriter using reflection", e); } } @@ -56,7 +56,7 @@ instMeth.setAccessible(true); return (Boolean) instMeth.invoke(o); } catch (Exception e) { - throw new RuntimeException("Could not call isStateWritten on com.sun.facelets.StateWriter using reflection", e); + throw new RuntimeException("Could not call isStateWritten on com.sun.faces.facelets.StateWriter using reflection", e); } } @@ -70,7 +70,7 @@ instMeth.setAccessible(true); return (String) instMeth.invoke(o); } catch (Exception e) { - throw new RuntimeException("Could not call getAndResetBuffer on com.sun.facelets.StateWriter using reflection", e); + throw new RuntimeException("Could not call getAndResetBuffer on com.sun.faces.facelets.StateWriter using reflection", e); } } @@ -84,7 +84,7 @@ instMeth.setAccessible(true); instMeth.invoke(o); } catch (Exception e) { - throw new RuntimeException("Could not call release on com.sun.facelets.StateWriter using reflection",e); + throw new RuntimeException("Could not call release on com.sun.faces.facelets.StateWriter using reflection",e); } } Modified: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/Contexts.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/Contexts.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/Contexts.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -33,14 +33,20 @@ public String[] getSession() { - String[] names = org.jboss.seam.contexts.Contexts.getSessionContext().getNames(); + String[] names={}; + if(org.jboss.seam.contexts.Contexts.isSessionContextActive()) { + names = org.jboss.seam.contexts.Contexts.getSessionContext().getNames(); + } Arrays.sort(names); return names; } public String[] getConversation() { - String[] names = org.jboss.seam.contexts.Contexts.getConversationContext().getNames(); + String[] names = {}; + if ( org.jboss.seam.contexts.Contexts.isConversationContextActive()) { + names = org.jboss.seam.contexts.Contexts.getConversationContext().getNames(); + } Arrays.sort(names); return names; } @@ -61,7 +67,17 @@ public Exception getException() { - return (Exception) org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException"); + Exception e=null; + if(org.jboss.seam.contexts.Contexts.isConversationContextActive()) + { + if(org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException")==null) { + return null; + } + else { + e=(Exception)org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException"); + } + } + return e; } public List<Exception> getExceptionCauses() Deleted: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/DebugRedirect.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/DebugRedirect.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/DebugRedirect.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,31 +0,0 @@ -package org.jboss.seam.debug.jsf; - -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.faces.FacesManager; - -@Name("org.jboss.seam.debug.jsf.debugRedirect") -@BypassInterceptors -@Install(debug = true, precedence = BUILT_IN, classDependencies = "javax.faces.context.FacesContext") -public class DebugRedirect -{ - private String viewId; - - public String getViewId() - { - return viewId; - } - - public void setViewId(String viewId) - { - this.viewId = viewId; - } - - public void execute() - { - FacesManager.instance().redirect(viewId, null, false); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugPhaseListener.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugPhaseListener.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugPhaseListener.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,125 +0,0 @@ -package org.jboss.seam.debug.jsf; - -import java.io.IOException; -import java.io.Writer; -import java.net.URL; - -import javax.faces.application.StateManager; -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.seam.contexts.FacesLifecycle; -import org.jboss.seam.navigation.Pages; - -import com.sun.facelets.Facelet; -import com.sun.facelets.StateWriterControl; -import com.sun.facelets.compiler.SAXCompiler; -import com.sun.facelets.impl.DefaultFaceletFactory; -import com.sun.facelets.impl.DefaultResourceResolver; - -/** - * Intercepts any request for a view-id like /debug.xxx and renders - * the Seam debug page using facelets. - * - * @author Gavin King - */ -public class SeamDebugPhaseListener implements PhaseListener -{ - private static final String STATE_KEY = "~facelets.VIEW_STATE~"; - - public void beforePhase(PhaseEvent event) - { - FacesLifecycle.setPhaseId( event.getPhaseId() ); //since this gets called before SeamPhaseListener! - - if ( Pages.isDebugPage() ) - { - try - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - URL url = SeamDebugPhaseListener.class.getClassLoader().getResource("META-INF/debug.xhtml"); - Facelet f = new DefaultFaceletFactory( new SAXCompiler(), new DefaultResourceResolver() ).getFacelet(url); - UIViewRoot viewRoot = facesContext.getViewRoot(); - f.apply(facesContext, viewRoot); - HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext().getResponse(); - response.setCharacterEncoding("UTF-8"); - response.setContentType("text/html; UTF-8"); - ResponseWriter originalWriter = facesContext.getRenderKit().createResponseWriter( response.getWriter(), "text/html", "UTF-8" ); - StateWriterControl.initialize(originalWriter); - ResponseWriter writer = StateWriterControl.createClone(originalWriter); - facesContext.setResponseWriter(writer); - writer.startDocument(); - viewRoot.encodeAll(facesContext); - writer.endDocument(); - writer.close(); - writeState(facesContext, originalWriter); - originalWriter.flush(); - facesContext.responseComplete(); - } - catch (IOException ioe) - { - throw new RuntimeException(ioe); - } - } - } - - public void afterPhase(PhaseEvent event) {} - - public PhaseId getPhaseId() - { - return PhaseId.RENDER_RESPONSE; - } - - private void writeState(FacesContext facesContext, Writer writer) throws IOException { - try - { - if (StateWriterControl.isStateWritten()) - { - String content = StateWriterControl.getAndResetBuffer(); - int end = content.indexOf(STATE_KEY); - if (end >= 0) - { - StateManager stateMgr = facesContext.getApplication().getStateManager(); - Object stateObj = stateMgr.saveView(facesContext); - String stateStr; - if (stateObj == null) - { - stateStr = null; - } - else - { - stateMgr.writeState(facesContext, stateObj); - stateStr = StateWriterControl.getAndResetBuffer(); - } - - int start = 0; - - while (end != -1) - { - writer.write(content, start, end - start); - if (stateStr != null) - { - writer.write(stateStr); - } - start = end + STATE_KEY.length(); - end = content.indexOf(STATE_KEY, start); - } - writer.write(content, start, content.length() - start); - } - else - { - writer.write(content); - } - } - } - finally - { - StateWriterControl.release(); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugSerializationProvider.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugSerializationProvider.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf/SeamDebugSerializationProvider.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,118 +0,0 @@ -package org.jboss.seam.debug.jsf; - -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.ObjectStreamClass; -import java.io.OutputStream; -import java.util.HashSet; -import java.util.Set; - -import org.jboss.seam.Component; -import org.jboss.seam.core.Init; -import org.jboss.seam.log.LogProvider; -import org.jboss.seam.log.Logging; - -import com.sun.faces.spi.SerializationProvider; - - -/** - * This serialization provider can be used by JSF when restoring the view. It will check - * the hot deploy classloader(s) for class definitions that cannot be found in the context - * classloader. It is only needed when using client side state saving with hotdeployable classes - * in the view. To enable, add the following to web.xml: - * - * <pre> - * <context-param> - * <param-name>com.sun.faces.serializationProvider</param-name> - * <param-value>org.jboss.seam.faces.SeamDebugSerializationProvider</param-value> - * </context-param> - * </pre> - */ -public class SeamDebugSerializationProvider - implements SerializationProvider -{ - - public ObjectInputStream createObjectInputStream(InputStream source) throws IOException { - return new SeamObjectInputStream(source); - } - - public ObjectOutputStream createObjectOutputStream(OutputStream destination) throws IOException { - return new ObjectOutputStream(destination); - } - - - static class SeamObjectInputStream - extends ObjectInputStream - { - private static final LogProvider log = Logging.getLogProvider(SeamObjectInputStream.class); - - public SeamObjectInputStream(InputStream source) - throws IOException - { - super(source); - } - - @Override - protected Class<?> resolveClass(ObjectStreamClass desc) - throws IOException, - ClassNotFoundException - { - String className = desc.getName(); - - try { - return Class.forName(className, - true, - Thread.currentThread().getContextClassLoader()); - } catch (ClassNotFoundException e) { - Class found = lookupInHotDeployLoaders(className); - if (found != null) { - return found; - } - // can't find it - rethrow the class not found exception - throw e; - } - } - - private Class lookupInHotDeployLoaders(String className) { - log.debug("need to check hotdeploy classloaders to resolve " + className); - - // this code can be made tighter if we assume there is only one hotdeployable location - Set<ClassLoader> loaders = new HashSet<ClassLoader>(); - for (String name: Init.instance().getHotDeployableComponents()) { - ClassLoader loader = loaderForComponent(name); - - // make sure we only try the loader once - if (loaders.add(loader)) { - Class c = tryToLoadClass(loader,className); - if (c != null){ - return c; - } - } - } - - return null; - } - - private Class tryToLoadClass(ClassLoader loader, String className) { - try { - return loader.loadClass(className); - } catch (Exception e) { - log.debug("class not found in loader" + loader); - return null; - } - } - - private ClassLoader loaderForComponent(String name) { - Component component = (Component) Component.getInstance(name + ".component"); - if (component == null) { - log.debug("Couldn't find component for " + name); - return null; - } - - return component.getBeanClass().getClassLoader(); - } - - } -} \ No newline at end of file Copied: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java (from rev 14388, branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java) =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java (rev 0) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -0,0 +1,135 @@ +package org.jboss.seam.debug.jsf2; + +import java.io.IOException; +import java.io.Writer; +import java.net.URL; + +import javax.faces.application.StateManager; +import javax.faces.component.UIViewRoot; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.view.facelets.ResourceResolver; +import javax.servlet.http.HttpServletResponse; + +import org.jboss.seam.contexts.FacesLifecycle; +import org.jboss.seam.navigation.Pages; + +import com.sun.facelets.StateWriterControl; +import com.sun.faces.facelets.Facelet; +import com.sun.faces.facelets.compiler.SAXCompiler; +import com.sun.faces.facelets.impl.DefaultFaceletFactory; +import com.sun.faces.facelets.impl.DefaultResourceResolver; + +/** + * Intercepts any request for a view-id like /debug.xxx and renders + * the Seam debug page using facelets. + * + * @author Gavin King + */ +public class SeamDebugPhaseListener implements PhaseListener +{ + private static final String STATE_KEY = "~facelets.VIEW_STATE~"; + + public void beforePhase(PhaseEvent event) + { + FacesLifecycle.setPhaseId( event.getPhaseId() ); //since this gets called before SeamPhaseListener! + + if ( Pages.isDebugPage() ) + { + try + { + FacesContext facesContext = FacesContext.getCurrentInstance(); + URL url = SeamDebugPhaseListener.class.getClassLoader().getResource("META-INF/debug.xhtml"); + + ResourceResolver resroler=new ResourceResolver(){ + @Override + public URL resolveUrl(String path) + { + return SeamDebugPhaseListener.class.getClassLoader().getResource(path); + } + }; + + Facelet f = new DefaultFaceletFactory( new SAXCompiler(),resroler).getFacelet(url); + UIViewRoot viewRoot = facesContext.getViewRoot(); + f.apply(facesContext, viewRoot); + HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext().getResponse(); + response.setCharacterEncoding("UTF-8"); + response.setContentType("text/html; UTF-8"); + ResponseWriter originalWriter = facesContext.getRenderKit().createResponseWriter( response.getWriter(), "text/html", "UTF-8" ); + StateWriterControl.initialize(originalWriter); + ResponseWriter writer = StateWriterControl.createClone(originalWriter); + facesContext.setResponseWriter(writer); + writer.startDocument(); + viewRoot.encodeAll(facesContext); + writer.endDocument(); + writer.close(); + writeState(facesContext, originalWriter); + originalWriter.flush(); + facesContext.responseComplete(); + } + catch (IOException ioe) + { + throw new RuntimeException(ioe); + } + } + } + + public void afterPhase(PhaseEvent event) {} + + public PhaseId getPhaseId() + { + return PhaseId.RENDER_RESPONSE; + } + + private void writeState(FacesContext facesContext, Writer writer) throws IOException { + try + { + if (StateWriterControl.isStateWritten()) + { + String content = StateWriterControl.getAndResetBuffer(); + int end = content.indexOf(STATE_KEY); + if (end >= 0) + { + StateManager stateMgr = facesContext.getApplication().getStateManager(); + Object stateObj = stateMgr.saveView(facesContext); + String stateStr; + if (stateObj == null) + { + stateStr = null; + } + else + { + stateMgr.writeState(facesContext, stateObj); + stateStr = StateWriterControl.getAndResetBuffer(); + } + + int start = 0; + + while (end != -1) + { + writer.write(content, start, end - start); + if (stateStr != null) + { + writer.write(stateStr); + } + start = end + STATE_KEY.length(); + end = content.indexOf(STATE_KEY, start); + } + writer.write(content, start, content.length() - start); + } + else + { + writer.write(content); + } + } + } + finally + { + StateWriterControl.release(); + } + } + +} Modified: branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/faces-config.xml 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/faces-config.xml 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,11 +1,11 @@ <?xml version="1.0"?> -<faces-config version="1.2" +<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> <lifecycle> - <phase-listener>org.jboss.seam.debug.jsf.SeamDebugPhaseListener</phase-listener> + <phase-listener>org.jboss.seam.debug.jsf2.SeamDebugPhaseListener</phase-listener> </lifecycle> </faces-config> Deleted: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/com/sun/facelets/StateWriterControl.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,91 +0,0 @@ -package com.sun.facelets; - -import java.io.Writer; -import java.lang.reflect.*; - -import javax.faces.context.ResponseWriter; - -/** - * This is a hack to instantiate a thread-local object that Facelets uses to - * write the STATE_KEY into the response when directed by JSF. The STATE_KEY is - * written in the case when there is a form on the page. This hack is necessary - * since we are not calling Facelets in the normal way (and hence it is not - * completely initialized). - */ -public class StateWriterControl { - final static String STATEWRITER_CLASS_NAME = "com.sun.faces.facelets.StateWriter"; - - static Class getStateWriter() { - try { - return Class.forName(STATEWRITER_CLASS_NAME); - } catch (Exception e) { - throw new RuntimeException("Could not load class com.sun.faces.facelets.StateWriter using reflection", e); - } - } - - public static void initialize(Writer writer) { - try { - Class sw = getStateWriter(); - Constructor constructor = sw.getConstructor(Writer.class, int.class); - constructor.setAccessible(true); - constructor.newInstance(writer, 1024); - } catch (Exception e) { - throw new RuntimeException("Could not initilise com.sun.faces.facelets.StateWriter using reflection", e); - } - } - - public static ResponseWriter createClone(ResponseWriter writer) { - try { - Class sw = getStateWriter(); - Method meth = sw.getMethod("getCurrentInstance"); - meth.setAccessible(true); - Writer w = (Writer) meth.invoke(null); - return writer.cloneWithWriter(w); - } catch (Exception e) { - throw new RuntimeException("Could not create clone of com.sun.faces.facelets.StateWriter using reflection", e); - } - } - - public static boolean isStateWritten() { - try { - Class sw = getStateWriter(); - Method meth = sw.getMethod("getCurrentInstance"); - meth.setAccessible(true); - Object o = meth.invoke(null); - Method instMeth = sw.getMethod("isStateWritten"); - instMeth.setAccessible(true); - return (Boolean) instMeth.invoke(o); - } catch (Exception e) { - throw new RuntimeException("Could not call isStateWritten on com.sun.faces.facelets.StateWriter using reflection", e); - } - } - - public static String getAndResetBuffer() { - try { - Class sw = getStateWriter(); - Method meth = sw.getMethod("getCurrentInstance"); - meth.setAccessible(true); - Object o = meth.invoke(null); - Method instMeth = sw.getMethod("getAndResetBuffer"); - instMeth.setAccessible(true); - return (String) instMeth.invoke(o); - } catch (Exception e) { - throw new RuntimeException("Could not call getAndResetBuffer on com.sun.faces.facelets.StateWriter using reflection", e); - } - } - - public static void release() { - try { - Class sw = getStateWriter(); - Method meth = sw.getMethod("getCurrentInstance"); - meth.setAccessible(true); - Object o = meth.invoke(null); - Method instMeth = sw.getMethod("release"); - instMeth.setAccessible(true); - instMeth.invoke(o); - } catch (Exception e) { - throw new RuntimeException("Could not call release on com.sun.faces.facelets.StateWriter using reflection",e); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Contexts.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,98 +0,0 @@ -package org.jboss.seam.debug; - -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.core.ConversationEntries; -import org.jboss.seam.core.ConversationEntry; -import org.jboss.seam.util.Exceptions; - -@Name("org.jboss.seam.debug.contexts") -(a)Scope(ScopeType.APPLICATION) -@Install(debug=true, precedence=BUILT_IN) -public class Contexts -{ - public List<ConversationEntry> getConversationEntries() - { - return new ArrayList<ConversationEntry>( ConversationEntries.instance().getConversationEntries() ); - } - - public String[] getApplication() - { - String[] names = org.jboss.seam.contexts.Contexts.getApplicationContext().getNames(); - Arrays.sort(names); - return names; - } - - public String[] getSession() - { - String[] names={}; - if(org.jboss.seam.contexts.Contexts.isSessionContextActive()) { - names = org.jboss.seam.contexts.Contexts.getSessionContext().getNames(); - } - Arrays.sort(names); - return names; - } - - public String[] getConversation() - { - String[] names = {}; - if ( org.jboss.seam.contexts.Contexts.isConversationContextActive()) { - names = org.jboss.seam.contexts.Contexts.getConversationContext().getNames(); - } - Arrays.sort(names); - return names; - } - - public String[] getBusinessProcess() - { - if ( org.jboss.seam.contexts.Contexts.isBusinessProcessContextActive() ) - { - String[] names = org.jboss.seam.contexts.Contexts.getBusinessProcessContext().getNames(); - Arrays.sort(names); - return names; - } - else - { - return null; - } - } - - public Exception getException() - { - Exception e=null; - if(org.jboss.seam.contexts.Contexts.isConversationContextActive()) - { - if(org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException")==null) { - return null; - } - else { - e=(Exception)org.jboss.seam.contexts.Contexts.getConversationContext().get("org.jboss.seam.caughtException"); - } - } - return e; - } - - public List<Exception> getExceptionCauses() - { - List<Exception> causes = new ArrayList<Exception>(); - for (Exception cause=getException(); cause!=null; cause=Exceptions.getCause(cause)) - { - causes.add(cause); - } - return causes; - } - - public boolean isExceptionExists() - { - return getException()!=null; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Introspector.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Introspector.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/Introspector.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,153 +0,0 @@ -package org.jboss.seam.debug; - -import static org.jboss.seam.annotations.Install.BUILT_IN; - -import java.beans.BeanInfo; -import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.web.RequestParameter; -import org.jboss.seam.contexts.Contexts; - -@Name("org.jboss.seam.debug.introspector") -@Install(debug=true, precedence=BUILT_IN) -public class Introspector { - - @RequestParameter - private String name; - - public Attribute[] getAttributes() throws Exception - { - if (name==null) return null; - Object component = Contexts.lookupInStatefulContexts(name); - if (component==null) - { - return null; - } - else if (component instanceof Map) - { - return getMapAttributes( (Map) component ); - } - else if (component instanceof List) - { - return getListAttributes( (List) component ); - } - else - { - return getComponentAttributes(component); - } - } - - public Attribute[] getMapAttributes(Map<Object, Object> map) - { - Attribute[] attributes = new Attribute[map.size()]; - int i=0; - for( Map.Entry me: map.entrySet() ) - { - attributes[i++] = new Attribute( me.getKey().toString(), me.getValue() ); - } - return attributes; - } - - public Attribute[] getListAttributes(List list) - { - Attribute[] attributes = new Attribute[list.size()]; - for(int i=0; i<list.size(); i++ ) - { - attributes[i] = new Attribute( Integer.toString(i), list.get(i) ); - } - return attributes; - } - - private Attribute[] getComponentAttributes(Object component) throws IntrospectionException, IllegalAccessException { - BeanInfo bi = java.beans.Introspector.getBeanInfo( component.getClass() ); - //MethodDescriptor[] methods = bi.getMethodDescriptors(); - PropertyDescriptor[] properties = bi.getPropertyDescriptors(); - Attribute[] attributes = new Attribute[properties.length+1]; - for (int i=0; i<properties.length; i++) - { - Object value; - try - { - Method readMethod = properties[i].getReadMethod(); - if (readMethod==null) continue; - value = readMethod.invoke(component); - } - catch (InvocationTargetException ite) - { - Throwable e = ite.getCause(); - value = toString(e); - } - - boolean convertArrayToList = value!=null && - value.getClass().isArray() && - !value.getClass().getComponentType().isPrimitive(); - if ( convertArrayToList ) - { - value = Arrays.asList( (Object[]) value ); - } - - attributes[i] = new Attribute( properties[i].getDisplayName(), value ); - } - - String toString; - try - { - toString = component.toString(); - } - catch (Exception e) - { - toString = e.getClass().getName() + '[' + e.getMessage() + ']'; - } - attributes[properties.length] = new Attribute("toString()", toString); - - return attributes; - } - - private static String toString(Throwable e) - { - return e.getClass().getName() + '[' + e.getMessage() + ']'; - } - - public static class Attribute - { - private String name; - private Object value; - - public Attribute(String name, Object value) - { - this.name = name; - this.value = value; - } - - public String getName() - { - return name; - } - - public Object getValue() - { - return value; - } - - public String getStringValue() - { - try - { - return value==null ? null : value.toString(); - } - catch (Throwable e) - { - return Introspector.toString(e); - } - } - - } -} Deleted: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,135 +0,0 @@ -package org.jboss.seam.debug.jsf2; - -import java.io.IOException; -import java.io.Writer; -import java.net.URL; - -import javax.faces.application.StateManager; -import javax.faces.component.UIViewRoot; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; -import javax.faces.view.facelets.ResourceResolver; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.seam.contexts.FacesLifecycle; -import org.jboss.seam.navigation.Pages; - -import com.sun.facelets.StateWriterControl; -import com.sun.faces.facelets.Facelet; -import com.sun.faces.facelets.compiler.SAXCompiler; -import com.sun.faces.facelets.impl.DefaultFaceletFactory; -import com.sun.faces.facelets.impl.DefaultResourceResolver; - -/** - * Intercepts any request for a view-id like /debug.xxx and renders - * the Seam debug page using facelets. - * - * @author Gavin King - */ -public class SeamDebugPhaseListener implements PhaseListener -{ - private static final String STATE_KEY = "~facelets.VIEW_STATE~"; - - public void beforePhase(PhaseEvent event) - { - FacesLifecycle.setPhaseId( event.getPhaseId() ); //since this gets called before SeamPhaseListener! - - if ( Pages.isDebugPage() ) - { - try - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - URL url = SeamDebugPhaseListener.class.getClassLoader().getResource("META-INF/debug.xhtml"); - - ResourceResolver resroler=new ResourceResolver(){ - @Override - public URL resolveUrl(String path) - { - return SeamDebugPhaseListener.class.getClassLoader().getResource(path); - } - }; - - Facelet f = new DefaultFaceletFactory( new SAXCompiler(),resroler).getFacelet(url); - UIViewRoot viewRoot = facesContext.getViewRoot(); - f.apply(facesContext, viewRoot); - HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext().getResponse(); - response.setCharacterEncoding("UTF-8"); - response.setContentType("text/html; UTF-8"); - ResponseWriter originalWriter = facesContext.getRenderKit().createResponseWriter( response.getWriter(), "text/html", "UTF-8" ); - StateWriterControl.initialize(originalWriter); - ResponseWriter writer = StateWriterControl.createClone(originalWriter); - facesContext.setResponseWriter(writer); - writer.startDocument(); - viewRoot.encodeAll(facesContext); - writer.endDocument(); - writer.close(); - writeState(facesContext, originalWriter); - originalWriter.flush(); - facesContext.responseComplete(); - } - catch (IOException ioe) - { - throw new RuntimeException(ioe); - } - } - } - - public void afterPhase(PhaseEvent event) {} - - public PhaseId getPhaseId() - { - return PhaseId.RENDER_RESPONSE; - } - - private void writeState(FacesContext facesContext, Writer writer) throws IOException { - try - { - if (StateWriterControl.isStateWritten()) - { - String content = StateWriterControl.getAndResetBuffer(); - int end = content.indexOf(STATE_KEY); - if (end >= 0) - { - StateManager stateMgr = facesContext.getApplication().getStateManager(); - Object stateObj = stateMgr.saveView(facesContext); - String stateStr; - if (stateObj == null) - { - stateStr = null; - } - else - { - stateMgr.writeState(facesContext, stateObj); - stateStr = StateWriterControl.getAndResetBuffer(); - } - - int start = 0; - - while (end != -1) - { - writer.write(content, start, end - start); - if (stateStr != null) - { - writer.write(stateStr); - } - start = end + STATE_KEY.length(); - end = content.indexOf(STATE_KEY, start); - } - writer.write(content, start, content.length() - start); - } - else - { - writer.write(content); - } - } - } - finally - { - StateWriterControl.release(); - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/debug.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/debug.xhtml 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/debug.xhtml 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,255 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html"> -<f:view> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>JBoss Seam Debug Page</title> - <style type="text/css"> - body, div, span, td, th, caption { font-family: 'Trebuchet MS', Verdana, Arial, Sans-Serif; font-size: small; } - ul, li, pre { padding: 0; margin: 0; } - h1 { color: #090; } - h1 a { text-decoration: none; color: #090; } - h2, h2 span { font-size: large; color: #339; } - h2 a { text-decoration: none; color: #339; } - pre { padding: 8px; margin: 10px 0; border: 1px solid #CCC; background-color: #f9f9f9; } - #applicationContext { display: none; } - #attributes, #conversationContext, #sessionContext, #processContext { display: block; } - code { font-size: medium; } - table { border: 1px solid #CCC; border-collapse: collapse; border-spacing: 0px; width: 100%; text-align: left; } - td { border: 1px solid #CCC; } - thead tr th { padding: 2px; color: #030; background-color: #F9F9F9; } - tbody tr td { padding: 5px 3px; } - table caption { text-align: left; padding: 5px 0; font-size: large; } - </style> - <style type="text/css" media="print"> - #sessionContext, #conversationContext, #applicationContext, #attributes, #processContext { display: block; } - </style> - <script language="Javascript" type="text/javascript"> - SeamDebugPage = {}; - SeamDebugPage.toggle = function(id) { - var el = document.getElementById(id); - var displayStyle = SeamDebugPage.getDisplayStyle(el); - if ("block" == displayStyle) { - el.style.display = "none"; - document.getElementById(id+"Off").style.display = "inline"; - document.getElementById(id+"On").style.display = "none"; - } - else { - el.style.display = "block"; - document.getElementById(id+"Off").style.display = "none"; - document.getElementById(id+"On").style.display = "inline"; - } - } - SeamDebugPage.getDisplayStyle = function(el) { - var value = el.style.display; - - if (!value) { - if (document.defaultView) { - value = document.defaultView.getComputedStyle(el, "").getPropertyValue("display"); - } - else if (el.currentStyle) { - value = el.currentStyle.display; - } - } - return value; - } - function foo() {} - </script> - </head> - <body> - <h1><h:outputLink value="#{facesContext.externalContext.request.requestURI}">JBoss Seam Debug Page</h:outputLink></h1> - <div> - This page allows you to browse and inspect components in any of the Seam - contexts associated with the current session. It also shows a list of - active, long-running conversations. You can select a conversation to view - its contents or destroy it. - </div> - - <h2>Conversations</h2> - <h:outputText value="No long-running conversations exist" - rendered="#{empty org.jboss.seam.debug.contexts.conversationEntries}"/> - <h:form rendered="#{not empty org.jboss.seam.debug.contexts.conversationEntries}"> - <h:dataTable var="_entry" value="#{org.jboss.seam.debug.contexts.conversationEntries}"> - <h:column> - <f:facet name="header">Conversation ID</f:facet> - #{_entry.id} - </h:column> - <h:column> - <f:facet name="header">Nested?</f:facet> - #{_entry.nested} - </h:column> - <h:column> - <f:facet name="header">Activity</f:facet> - <h:outputText value="#{_entry.startDatetime}"> - <f:convertDateTime type="time" timeZone="#{timeZone}"/> - </h:outputText> - #{' - '} - <h:outputText value="#{_entry.lastDatetime}"> - <f:convertDateTime type="time" timeZone="#{timeZone}"/> - </h:outputText> - </h:column> - <h:column> - <f:facet name="header">Description</f:facet> - #{_entry.description} - </h:column> - <h:column> - <f:facet name="header">View ID</f:facet> - #{_entry.viewId} - </h:column> - <h:column> - <f:facet name="header">Action</f:facet> - <h:outputLink> - Select - <f:param name="#{manager.conversationIdParameter}" value="#{_entry.id}"/> - </h:outputLink> - #{' '} - <h:commandLink actionListener="#{_entry.destroy}" action="#{org.jboss.seam.debug.jsf.debugRedirect.execute}" value="Destroy"> - <f:setPropertyActionListener target="#{org.jboss.seam.debug.jsf.debugRedirect.viewId}" value="#{view.viewId}"/> - </h:commandLink> - </h:column> - </h:dataTable> - </h:form> - - <h2> - <a href="#" onclick="SeamDebugPage.toggle('attributes'); return false;"> - <span id="attributesOff" style="display: none;">+</span> - <span id="attributesOn">-</span> -  Component  - <h:outputText value="(#{param['name']})" - rendered="#{org.jboss.seam.debug.introspector.attributes!=null}"/> - <h:outputText value="(None selected)" - rendered="#{org.jboss.seam.debug.introspector.attributes==null}"/> - </a> - </h2> - <div id="attributes"> - <h:outputText value="Select a component from one of the contexts below" - rendered="#{org.jboss.seam.debug.introspector.attributes==null}"/> - <h:dataTable value="#{org.jboss.seam.debug.introspector.attributes}" - rendered="#{org.jboss.seam.debug.introspector.attributes!=null}" - var="attribute"> - <h:column> - #{attribute.name} - </h:column> - <h:column> - #{attribute.stringValue} - </h:column> - </h:dataTable> - </div> - - <h2> - <a href="#" onclick="SeamDebugPage.toggle('conversationContext'); return false;"> - <span id="conversationContextOff" style="display: none;">+</span> - <span id="conversationContextOn">-</span> -  Conversation Context  - <h:outputText value="(#{manager.currentConversationId})" - rendered="#{manager.longRunningConversation}"/> - <h:outputText value="(None selected)" - rendered="#{!manager.longRunningConversation}"/> - </a> - </h2> - <div id="conversationContext"> - <h:outputText value="Empty conversation context" - rendered="#{empty org.jboss.seam.debug.contexts.conversation}"/> - <h:dataTable value="#{org.jboss.seam.debug.contexts.conversation}" - var="name"> - <h:column> - <h:outputLink> - #{name} - <f:param name="name" value="#{name}"/> - <f:param name="#{manager.conversationIdParameter}" value="#{conversation.id}"/> - </h:outputLink> - </h:column> - </h:dataTable> - </div> - - <h2> - <a href="#" onclick="SeamDebugPage.toggle('processContext'); return false;"> - <span id="processContextOff" style="display: none;">+</span> - <span id="processContextOn">-</span> -  Business Process Context - </a> - </h2> - <div id="processContext"> - <h:outputText value="Empty business process context" - rendered="#{empty org.jboss.seam.debug.contexts.businessProcess}"/> - <h:dataTable value="#{org.jboss.seam.debug.contexts.businessProcess}" - var="name"> - <h:column> - <h:outputLink> - #{name} - <f:param name="name" value="#{name}"/> - <f:param name="#{manager.conversationIdParameter}" value="#{conversation.id}"/> - </h:outputLink> - </h:column> - </h:dataTable> - </div> - - <h2> - <a href="#" onclick="SeamDebugPage.toggle('sessionContext'); return false;"> - <span id="sessionContextOff" style="display: none;">+</span> - <span id="sessionContextOn">-</span> -  Session Context - </a> - </h2> - <div id="sessionContext"> - <h:outputText value="Empty session context" - rendered="#{empty org.jboss.seam.debug.contexts.session}"/> - <h:dataTable value="#{org.jboss.seam.debug.contexts.session}" - var="name"> - <h:column> - <h:outputLink> - #{name} - <f:param name="name" value="#{name}"/> - <f:param name="#{manager.conversationIdParameter}" value="#{conversation.id}"/> - </h:outputLink> - </h:column> - </h:dataTable> - </div> - - <h2> - <a href="#" onclick="SeamDebugPage.toggle('applicationContext'); return false;"> - <span id="applicationContextOff">+</span> - <span id="applicationContextOn" style="display: none;">-</span> -  Application Context - </a> - </h2> - <div id="applicationContext"> - <h:dataTable value="#{org.jboss.seam.debug.contexts.application}" - var="name"> - <h:column> - <h:outputLink> - #{name} - <f:param name="name" value="#{name}"/> - <f:param name="#{manager.conversationIdParameter}" value="#{conversation.id}"/> - </h:outputLink> - </h:column> - </h:dataTable> - </div> - - <f:subview rendered="#{org.jboss.seam.debug.contexts.exceptionExists}"> - <h2> - <a href="#" onclick="SeamDebugPage.toggle('stackTrace'); return false;"> - <span id="stackTraceOff" style="display: none;">+</span> - <span id="stackTraceOn">-</span> -  Exception - </a> - </h2> - <div id="stackTrace"> - Exception during request processing: - <ui:repeat value="#{org.jboss.seam.debug.contexts.exceptionCauses}" var="exception"> - <div> - Caused by #{exception.class.name} with message: "#{exception.getMessage()}" - <pre><ui:repeat value="#{exception.stackTrace}" var="stackElement"> -#{stackElement}</ui:repeat></pre> - </div> - </ui:repeat> - </div> - </f:subview> - - </body> -</f:view> -</html> Deleted: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/faces-config.xml 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/META-INF/faces-config.xml 2012-03-14 17:35:46 UTC (rev 14389) @@ -1,11 +0,0 @@ -<?xml version="1.0"?> -<faces-config version="2.0" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> - - <lifecycle> - <phase-listener>org.jboss.seam.debug.jsf2.SeamDebugPhaseListener</phase-listener> - </lifecycle> - -</faces-config> Deleted: branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/seam.properties =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/seam.properties 2012-03-14 17:34:37 UTC (rev 14388) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/src/main/resources/seam.properties 2012-03-14 17:35:46 UTC (rev 14389) @@ -1 +0,0 @@ -

14 years

1
0
0 / 0

Seam SVN: r14388 - in branches/community/Seam_2_3: jboss-seam/src/main/java/org/jboss/seam/captcha and 80 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:34:37 -0400 (Wed, 14 Mar 2012) New Revision: 14388 Added: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/ClassValidator.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/JUnitSeamTest.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java Removed: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/antlr/org/jboss/seam/text/seam-text.g branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/Component.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/ComponentType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/ConcurrentRequestTimeoutException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/CyclicDependencyException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/Entity.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/Instance.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/InstantiationException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/Model.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/Namespace.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/NoConversationException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/RequiredException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/ScopeType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/Seam.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/ApplicationException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/AutoCreate.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Begin.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Conversational.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Create.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/DataBinderClass.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/DataSelectorClass.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Destroy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/End.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Factory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/FlushModeType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Import.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/In.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Install.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/JndiName.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Logger.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Name.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Namespace.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Observer.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Out.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Outcome.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/PerNestedConversation.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/RaiseEvent.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/ReadOnly.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Role.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Roles.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Scope.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Startup.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Synchronized.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/TransactionPropagationType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Transactional.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/Unwrap.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/async/Asynchronous.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/async/Duration.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/async/Expiration.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/async/FinalExpiration.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/async/IntervalCron.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/async/IntervalDuration.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/async/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/bpm/BeginTask.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/bpm/CreateProcess.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/bpm/EndTask.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/bpm/ResumeProcess.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/bpm/StartTask.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/bpm/Transition.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/bpm/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/datamodel/DataModel.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/datamodel/DataModelSelection.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/datamodel/DataModelSelectionIndex.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/datamodel/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/exception/HttpError.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/exception/Redirect.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/exception/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/faces/Converter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/faces/Validator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/faces/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/AroundInvoke.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/BypassInterceptors.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/Interceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/InterceptorType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/Interceptors.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/PostActivate.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/PostConstruct.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/PrePassivate.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/intercept/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/Admin.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/Delete.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/Insert.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/PermissionCheck.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/Read.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/Restrict.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/RoleCheck.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/TokenUsername.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/TokenValue.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/Update.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/PasswordSalt.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/RoleConditional.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/RoleGroups.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/RoleName.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/UserEnabled.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/UserFirstName.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/UserLastName.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/UserPassword.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/UserPrincipal.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/management/UserRoles.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/Identifier.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/Permission.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/PermissionAction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/PermissionDiscriminator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/PermissionRole.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/PermissionTarget.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/PermissionUser.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/security/permission/Permissions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/web/Filter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/web/RequestParameter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/annotations/web/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/AbstractDispatcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/Asynchronous.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/AsynchronousEvent.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/AsynchronousExceptionHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/AsynchronousInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/AsynchronousInvocation.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/CronSchedule.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/Dispatcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/LocalTimerServiceDispatcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/QuartzDispatcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/QuartzTriggerHandle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/Schedule.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/ThreadPoolDispatcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/TimerSchedule.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/TimerServiceDispatcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/TransactionCompletionEvent.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/TransactionSuccessEvent.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/async/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/Actor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/BusinessProcess.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/BusinessProcessInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/Jbpm.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/JbpmELResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/ManagedJbpmContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/PageflowDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/PageflowParser.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/PooledTask.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/PooledTaskInstanceList.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/ProcessInstance.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/ProcessInstanceFinder.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/SeamExpressionEvaluator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/SeamUserCodeInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/TaskInstance.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/TaskInstanceList.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/TaskInstanceListForType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/TaskInstancePriorityList.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/Transition.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/jbpm.pageflow.cfg.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/bpm/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/cache/AbstractJBossCacheProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/cache/CacheProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/cache/EhCacheProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/cache/JbossCache2Provider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/cache/JbossCacheProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/cache/JbossPojoCacheProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/cache/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/captcha/Captcha.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/captcha/CaptchaImage.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/captcha/CaptchaResponse.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/captcha/CaptchaResponseValidator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/captcha/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/AbstractEntityBeanCollection.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/ApplicationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/BasicContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/BusinessProcessContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Context.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Contexts.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/EntityBean.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/EntityBeanList.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/EntityBeanMap.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/EntityBeanSet.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/EventContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/FacesLifecycle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Lifecycle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/PageContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/PassivatedEntity.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/RemotingLifecycle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/ServerConversationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/ServletLifecycle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/SessionContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/TestLifecycle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/Wrapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/contexts/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/AbstractMutable.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/BijectionInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ClassValidator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Contexts.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Conversation.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationEntries.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationEntry.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationIdGenerator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationList.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationPropagation.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationStack.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ConversationalInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/EventInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Events.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Expressions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Init.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Interpolator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Locale.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/LockTimeoutException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Manager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/MethodContextInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Mutable.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/PropagationType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ResourceBundle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/ResourceLoader.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/SeamResourceBundle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/SynchronizationInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/Validators.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/core/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/databinding/DataBinder.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/databinding/DataModelBinder.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/databinding/DataModelIndexSelector.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/databinding/DataModelSelector.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/databinding/DataSelector.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/databinding/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/AbstractClassDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/AbstractDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/AbstractScanner.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/AnnotationDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/ClassDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/ClassDeploymentMetadata.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/ClassDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/ComponentDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/ComponentsXmlDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/DeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/DeploymentMetadata.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/DeploymentStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/DotComponentDotXmlDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/DotPageDotXmlDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/FileDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/ForwardingAbstractScanner.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/ForwardingDeploymentStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/GroovyDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/GroovyHotDeploymentStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/HotDeploymentStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/NamespaceDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/PagesDotXmlDeploymentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/Scanner.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/SeamDeploymentProperties.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/StandardDeploymentStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/TimestampCheckForwardingDeploymentStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/TimestampScanner.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/URLScanner.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/WarRootDeploymentStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/deployment/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/document/ByteArrayDocumentData.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/document/DocumentData.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/document/DocumentStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/document/DocumentStorePhaseListener.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/document/DocumentStoreServlet.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/document/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/Decision.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/DroolsActionHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/DroolsAssignmentHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/DroolsDecisionHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/DroolsHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/ManagedWorkingMemory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/RuleAgent.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/RuleBase.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/SeamGlobalResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/SpreadsheetCompiler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/drools/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/ejb/RemoveInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/ejb/SeamInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/ejb/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/el/EL.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/el/JBossELReferenceCache.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/el/OptionalParameterMethodExpression.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/el/SeamELResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/el/SeamExpressionFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/el/SeamFunctionMapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/el/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/AnnotationErrorHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/AnnotationRedirectHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/ConfigErrorHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/ConfigRedirectHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/DebugPageHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/ErrorHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/ExceptionHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/Exceptions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/RedirectHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/exception/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/DataModels.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/DateConverter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/FacesContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/FacesExpressions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/FacesManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/FacesMessages.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/FacesPage.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/HttpError.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/IsUserInRole.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/Navigator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/Parameters.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/Redirect.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/RedirectException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/Renderer.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/ResourceLoader.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/Selector.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/Switcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/UiComponent.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/UserPrincipal.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/Validation.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/faces/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/BusinessProcessController.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/Controller.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/CurrentDate.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/CurrentDatetime.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/CurrentTime.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/EntityController.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/EntityHome.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/EntityIdentifier.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/EntityNotFoundException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/EntityQuery.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/HibernateEntityController.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/HibernateEntityHome.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/HibernateEntityIdentifier.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/HibernateEntityQuery.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/Home.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/Identifier.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/MutableController.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/MutableEntityController.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/PersistenceController.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/Query.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/framework/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/ComponentDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/DependencyManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/DeploymentDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/EjbDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/EjbEntityDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/FactoryDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/Initialization.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/NamespaceDescriptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/NamespacePackageResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/init/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/AbstractInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/ClientSideInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/EE5SeamInvocationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/EJBInvocationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/EventType.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/Interceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/InvocationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/JavaBeanInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/OptimizedInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/Proxy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/RootInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/RootInvocationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/SeamInvocationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/SessionBeanInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/intercept/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/Locale.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/LocaleConfig.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/LocaleSelector.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/Messages.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/StatusMessage.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/StatusMessages.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/TimeZone.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/TimeZoneSelector.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/TimeZoneWrapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/TimeZones.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/international/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jms/ManagedQueueSender.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jms/ManagedTopicPublisher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jms/QueueConnection.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jms/QueueSession.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jms/TopicConnection.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jms/TopicSession.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jms/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/AgentID.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/DefaultExceptionHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/JBossClusterMonitor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/JMXInvocationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/MBeanProxy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/MBeanProxyCreationException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/Mbean.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/ProxyContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/ProxyExceptionHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/RuntimeProxyException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jmx/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/ArrayDataModel.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/DelegatingFacesContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/ListDataModel.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/MapDataModel.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamApplication.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamApplicationFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamNavigationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamPhaseListener.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamStateManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/SetDataModel.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/UnifiedELMethodBinding.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/UnifiedELValueBinding.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/jsf/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/log/JDKProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/log/Log.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/log/Log4JProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/log/LogImpl.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/log/LogProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/log/Logging.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/log/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mail/MailSession.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mail/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/DBUnitSeamTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/DelegatingServletInputStream.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/DelegatingServletOutputStream.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/EmbeddedBootstrap.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletRequest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/EnhancedMockHttpServletResponse.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/HeaderValueHolder.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/JUnitSeamTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockApplication.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockApplicationFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockExternalContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockFacesContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockFacesContextFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockFilterConfig.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockHttpServletRequest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockHttpServletResponse.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockHttpSession.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockLifecycle.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockLifecycleFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockLoginModule.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockNavigationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockRenderKit.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockRequestDispatcher.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockResponseStateManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockResponseWriter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockSecureEntity.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockServletContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockStateManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockTransport.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/MockViewHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/ResourceRequestEnvironment.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/SeamTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/ServletContextWrapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/mock/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Action.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/ConversationControl.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/ConversationIdParameter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Header.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Input.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/NaturalConversationIdParameter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Navigation.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/NavigationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Output.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Page.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Pages.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Param.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/ProcessControl.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Put.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/RedirectNavigationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/RenderNavigationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/Rule.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/SafeActions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/SyntheticConversationIdParameter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/TaskControl.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/navigation/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/pageflow/Page.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/pageflow/Pageflow.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/pageflow/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/AbstractPersistenceProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/EntityManagerFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/EntityManagerInvocationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/EntityManagerProxy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/EntityManagerProxyInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/Filter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/FullTextEntityManagerProxy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/FullTextHibernateSessionProxy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/HibernateSessionFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/HibernateSessionProxy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/HibernateSessionProxyInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/ManagedEntityInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/ManagedEntityWrapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/ManagedHibernateSession.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/PersistenceContextManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/PersistenceContexts.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/PersistenceProvider.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/QueryParser.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/persistence/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/AuthorizationException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/Configuration.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/Credentials.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/EntityAction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/EntityPermissionChecker.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/EntitySecurityListener.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/FacesSecurityEvents.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/HibernateSecurityInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/Identity.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/JpaTokenStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/NotLoggedInException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/RememberMe.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/Role.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/RunAsOperation.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/SecurityFunctions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/SecurityInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/SimpleGroup.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/SimplePrincipal.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/TokenStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/BinTools.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/MacBasedPRF.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/PBKDF2.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/PBKDF2Engine.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/PBKDF2Formatter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/PBKDF2HexFormatter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/PBKDF2Parameters.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/crypto/PRF.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/digest/DigestAuthenticator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/digest/DigestRequest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/digest/DigestUtils.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/digest/DigestValidationException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/jaas/SeamLoginModule.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/IdentityManagementException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/IdentityManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/IdentityStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/JpaIdentityStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/LdapIdentityStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/NoSuchRoleException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/NoSuchUserException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/PasswordHash.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/action/RoleAction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/action/RoleSearch.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/action/UserAction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/action/UserSearch.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/management/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/openid/OpenId.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/openid/OpenIdPhaseListener.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/openid/OpenIdPrincipal.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/ClassIdentifierStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/EntityIdentifierStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/IdentifierPolicy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/IdentifierStrategy.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/Permission.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/PermissionCheck.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/PermissionManager.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/PermissionMapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/PermissionMetadata.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/PermissionResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/PermissionStore.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/PersistentPermissionResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/ResolverChain.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/RoleCheck.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/action/PermissionSearch.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/security/permission/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/ContextualHttpServletRequest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/ResourceServlet.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/SeamCharacterEncodingFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/SeamExceptionFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/SeamFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/SeamListener.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/SeamRedirectFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/SeamResourceServlet.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/SeamServletFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/ServletApplicationMap.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/ServletRequestMap.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/ServletRequestSessionMap.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/ServletSessionMap.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/servlet/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/theme/Theme.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/theme/ThemeSelector.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/theme/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/AbstractUserTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/CMTTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/EjbSynchronizations.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/EjbTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/EntityTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/FacesTransactionEvents.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/HibernateTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/LocalEjbSynchronizations.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/NoTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/RollbackInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/SeSynchronizations.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/SynchronizationRegistry.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/Synchronizations.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/Transaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/TransactionInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/UTTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/UserTransaction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/transaction/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/AnnotatedBeanProperty.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Base64.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Conversions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/DTDEntityResolver.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/DelegatingInvocationHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/EJB.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/EnumerationEnumeration.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/EnumerationIterator.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Exceptions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Faces.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/FacesResources.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Hex.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Id.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/IteratorEnumeration.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/JSF.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Naming.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/ProxyFactory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/RandomStringUtils.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Reflections.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Resources.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/SortItem.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Sorter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Strings.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/TypedBeanProperty.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/Work.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/XML.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/util/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/AbstractFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/AbstractResource.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/Ajax4jsfFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/AuthenticationFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/CacheControlFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/CharacterEncodingFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/ConditionalAbstractResource.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/ContextFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/ExceptionFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/FileUploadException.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/FilterConfigWrapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/HotDeployFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/IdentityFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/IdentityRequestWrapper.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/IncomingPattern.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/IsUserInRole.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/Locale.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/LoggingFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/MultipartFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/MultipartRequest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/MultipartRequestImpl.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/OutgoingPattern.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/Parameters.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/Pattern.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/RedirectFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/Rewrite.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/RewriteFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/RewritingResponse.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/SeamFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/ServletContexts.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/ServletMapping.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/Session.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/UserPrincipal.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/WicketFilter.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/web/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/webservice/SOAPRequestHandler.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/webservice/WSSecurityInterceptor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/java/org/jboss/seam/webservice/package-info.java branches/community/Seam_2_3/jboss-seam-jsf2/src/main/javadoc/jdstyle.css branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/META-INF/components.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/META-INF/faces-config.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/META-INF/javamail.providers branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/META-INF/seam-deployment.properties branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/async-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/blacklist.properties branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/bpm-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/bpm/jbpm.pageflow.cfg.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/cache-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/components-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/core-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/document-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/drools-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/framework-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/international-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/jms-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/mail-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/navigation-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pageflow-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pages-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/persistence-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/remoting-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/security-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/theme-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/transaction-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/ui-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/web-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/wicket-2.3.xsd branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/META-INF/pagesForPageActionsTest.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/META-INF/seam.properties branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/AbstractPageTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Action.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Bar.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/BrokenAction.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ComponentTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ContextTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CoreTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicBar.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicFoo.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/DependencyTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Ejb.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/EjbBean.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ExpressionsTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Factory.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Foo.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/FooBar.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/HomeTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InitializationTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterceptorTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterpolatorTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InvocationControl.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MailTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockContainerTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockInvocationContext.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageActionsTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageConversationControlTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageDescriptorTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageParamTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowConfigurationTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PasswordHashTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/People.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Person.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/QueryTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/SeamTextTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/ActorTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/JbpmTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/TaskListTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/ConfigurableComponent.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/MyEntityHome.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/PrimaryColor.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/TestActions.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/entity/SimpleEntity.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/testng.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/IdentityRequestWrapperTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/RewriteTest.java branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/META-INF/pagesForPageActionsTest.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/META-INF/seam.properties branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/SeamTextTest.txt branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/ConfigurableComponent.component.xml branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/MyEntityHome.component.xml branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mail/Meldware.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mail/MeldwareUser.java Modified: branches/community/Seam_2_3/jboss-seam/pom.xml branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/captcha/CaptchaResponse.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/captcha/CaptchaResponseValidator.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/contexts/PageContext.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/SeamResourceBundle.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Validators.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/framework/Controller.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/framework/Query.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/international/StatusMessages.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/DelegatingFacesContext.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamApplication.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/jsf/SeamViewHandler.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockApplication.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockFacesContext.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/navigation/Param.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionFactory.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionInvocationHandler.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/persistence/HibernateSessionProxy.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/transaction/Transaction.java branches/community/Seam_2_3/jboss-seam/src/main/resources/META-INF/faces-config.xml branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/Foo.java branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/MailTest.java branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/PageParamTest.java branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java branches/community/Seam_2_3/jboss-seam/src/test/java/org/jboss/seam/test/unit/QueryTest.java Log: renamed jboss-seam-jsf2 jboss-seam Modified: branches/community/Seam_2_3/jboss-seam/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:34:37 UTC (rev 14388) @@ -8,11 +8,11 @@ <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> + + <artifactId>jboss-seam-jsf2</artifactId> <packaging>ejb</packaging> - <name>Seam Core</name> - <description>Seam core module for Seam framework</description> + <name>Seam Core JSF2</name> + <description>Seam core module for Seam framework integrated with JSF2</description> <build> <plugins> @@ -68,7 +68,7 @@ <manifest> <attribute name="Built-By" value="${user.name}" /> <attribute name="Implementation-Vendor" value="${project.organization.name}" /> - <attribute name="Implementation-Title" value="JBoss Seam Weblogic compatible" /> + <attribute name="Implementation-Title" value="JBoss Seam JSF2 Weblogic compatible" /> <attribute name="Implementation-Version" value="${project.version}" /> </manifest> </jar> @@ -79,7 +79,7 @@ <manifest> <attribute name="Built-By" value="${user.name}" /> <attribute name="Implementation-Vendor" value="${project.organization.name}" /> - <attribute name="Implementation-Title" value="JBoss Seam Weblogic compatible" /> + <attribute name="Implementation-Title" value="JBoss Seam JSF2 Weblogic compatible" /> <attribute name="Implementation-Version" value="${project.version}" /> </manifest> </jar> @@ -103,6 +103,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <optional>true</optional> + <version>4.0.1.Final</version> </dependency>  - <xs:simpleType name="componentNameType"> - <xs:restriction base="xs:string"> - <xs:minLength value="1" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="expressionType"> - <xs:union memberTypes="components:elType components:propertyType"/> - </xs:simpleType> - - <xs:simpleType name="boolean"> - <xs:union memberTypes="xs:boolean components:expressionType"/> - </xs:simpleType> - - <xs:simpleType name="string"> - <xs:union memberTypes="xs:string components:expressionType"/> - </xs:simpleType> - - <xs:simpleType name="int"> - <xs:union memberTypes="xs:int components:expressionType"/> - </xs:simpleType> - - <xs:simpleType name="componentName"> - <xs:union memberTypes="components:componentNameType components:expressionType" /> - </xs:simpleType> - - <xs:simpleType name="scopeType"> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="implementationType"> - <xs:restriction base="xs:token"> - <xs:enumeration value="hash"/> - <xs:enumeration value="linked"/> - <xs:enumeration value="tree"/> - <xs:enumeration value="HASH"/> - <xs:enumeration value="LINKED"/> - <xs:enumeration value="TREE"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="precedenceType"> - <xs:restriction base="xs:int"> - <xs:enumeration value="0"/> - <xs:enumeration value="10"/> - <xs:enumeration value="20"/> - <xs:enumeration value="30"/> - <xs:enumeration value="40"/> - </xs:restriction> - </xs:simpleType> -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/core-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/core-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/core-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/core" xmlns:core="http://jboss.com/products/seam/core" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:annotation> - <xs:documentation>The core Seam components</xs:documentation> - </xs:annotation> - - <xs:element name="init"> - <xs:annotation> - <xs:documentation>A Seam component that holds Seam configuration settings</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="interceptors" type="components:multiValuedProperty"> - <xs:annotation> - <xs:documentation>A list of interceptors that should be enabled for all components. You must specify all built-in interceptors as well as any additional interceptors. Execution order is determined by the around and within attributes on the @Interceptor annotation. - -These interceptors are enabled by default: - org.jboss.seam.core.SynchronizationInterceptor - org.jboss.seam.async.AsynchronousInterceptor - org.jboss.seam.ejb.RemoveInterceptor - org.jboss.seam.persistence.HibernateSessionProxyInterceptor - org.jboss.seam.persistence.EntityManagerProxyInterceptor - org.jboss.seam.core.MethodContextInterceptor - org.jboss.seam.core.EventInterceptor - org.jboss.seam.core.ConversationalInterceptor - org.jboss.seam.bpm.BusinessProcessInterceptor - org.jboss.seam.core.ConversationInterceptor - org.jboss.seam.core.BijectionInterceptor - org.jboss.seam.transaction.RollbackInterceptor - org.jboss.seam.transaction.TransactionInterceptor - org.jboss.seam.webservice.WSSecurityInterceptor - org.jboss.seam.security.SecurityInterceptor - -The distributable flag appends the ManagedEntityInterceptor to this list (applies only to conversation-scoped components).</xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.init"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.init"> - <xs:attribute name="debug" type="components:boolean" /> - <xs:attribute name="distributable" type="components:boolean" /> - <xs:attribute name="jndi-pattern" type="components:string" /> - <xs:attribute name="security-enabled" type="components:boolean" /> - <xs:attribute name="transaction-management-enabled" type="components:boolean"/> - </xs:attributeGroup> - - <xs:element name="manager"> - <xs:annotation> - <xs:documentation>The Seam conversation manager</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.manager"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.manager"> - <xs:attribute name="concurrent-request-timeout" type="components:int"/> - <xs:attribute name="conversation-timeout" type="components:int"/> - <xs:attribute name="conversation-id-parameter" type="components:string"/> - <xs:attribute name="parent-conversation-id-parameter" type="components:string"/> - <xs:attribute name="uri-encoding" type="components:string" /> - <xs:attribute name="default-flush-mode"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="MANUAL"/> - <xs:enumeration value="AUTO"/> - <xs:enumeration value="COMMIT"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - - <xs:element name="resource-loader"> - <xs:annotation> - <xs:documentation>Access to application resources and resource bundles</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="bundle-names" type="components:multiValuedProperty"> - <xs:annotation> - <xs:documentation>A list of resource bundle names</xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.resourceLoader"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.resourceLoader"> - <xs:attribute name="bundle-names" type="components:string" /> - </xs:attributeGroup> - - <xs:element name="pojo-cache"> - <xs:annotation> - <xs:documentation>Integration with JBoss Cache</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="core:attlist.pojoCache"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.pojoCache"> - <xs:attribute name="cfg-resource-name" type="components:string" /> - </xs:attributeGroup> -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/document-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/document-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/document-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:doc="http://jboss.com/products/seam/document" - xmlns:components="http://jboss.com/products/seam/components" - targetNamespace="http://jboss.com/products/seam/document" - elementFormDefault="qualified" - attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" - schemaLocation="components-2.3.xsd"/> - - <xs:element name="document-store"> - <xs:annotation> - <xs:documentation> - The document store is used to store rendered documents for download on a later request. - </xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="doc:attlist.docstore"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.docstore"> - <xs:attribute name="error-page" type="components:string"> - <xs:annotation> - <xs:documentation> - When a document had expired or otherwise cannot be loaded, this page is displayed. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="use-extensions" type="components:boolean"> - <xs:annotation> - <xs:documentation> - Controls whether or not the URLs for documents should contain their correct file name - extensions. Using file name extensions requires additional configuration in web.xml. - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/drools-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/drools-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/drools-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/drools" xmlns:drools="http://jboss.com/products/seam/drools" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="rule-base"> - <xs:annotation> - <xs:documentation>A drools rule base</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="drools:rule-files"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="drools:attlist.RuleBase"/> - </xs:complexType> - </xs:element> - <xs:element name="rule-files" type="components:multiValuedProperty"/> - <xs:attributeGroup name="attlist.RuleBase"> - <xs:attribute name="dsl-file" type="components:string"/> - <xs:attribute name="rule-files" type="components:string"/> - <xs:attribute name="consequence-exception-handler" type="components:expressionType"/> - </xs:attributeGroup> - - <xs:element name="rule-agent"> - <xs:annotation> - <xs:documentation>A drools BRMS configuration</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="drools:attlist.RuleAgent" /> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.RuleAgent"> - <xs:attribute name="configuration-file" type="components:string" /> - <xs:attribute name="config-name" type="components:string" /> - <xs:attribute name="new-instance" type="components:string" /> - <xs:attribute name="files" type="components:string" /> - <xs:attribute name="url" type="components:string" /> - <xs:attribute name="local-cache-dir" type="components:string" /> - <xs:attribute name="poll" type="components:string" /> - </xs:attributeGroup> - - <xs:element name="managed-working-memory"> - <xs:annotation> - <xs:documentation>A working memory for rules calculations</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="drools:event-listeners"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="drools:attlist.ManagedWorkingMemory"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedWorkingMemory"> - <xs:attribute name="rule-base" type="components:expressionType"/> - </xs:attributeGroup> - <xs:element name="event-listeners" type="components:multiValuedProperty"/> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/framework-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/framework-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/framework-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,171 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/framework" - xmlns:framework="http://jboss.com/products/seam/framework" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="entity-query"> - <xs:annotation> - <xs:documentation>A query controller for JPA queries</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:group-by"/> - <xs:element minOccurs="0" maxOccurs="1" name="hints" type="components:mapProperty" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Query"/> - <xs:attributeGroup ref="framework:attlist.entityQuery"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.entityQuery"> - <xs:attribute name="entity-manager" type="xs:string"/> - </xs:attributeGroup> - - <xs:element name="hibernate-entity-query"> - <xs:annotation> - <xs:documentation>A query controller for Hibernate queries</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:ejbql"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:order"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:restrictions"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:group-by"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Query"/> - <xs:attributeGroup ref="framework:attlist.HibernateEntityQuery"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateEntityQuery"> - <xs:attribute name="cacheable" type="components:boolean" /> - <xs:attribute name="cache-region" type="components:string"/> - <xs:attribute name="fetch-size" type="components:int"/> - <xs:attribute name="session" type="components:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.Query"> - <xs:attribute name="ejbql" type="components:string"> - <xs:annotation> - <xs:documentation>The base query</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="max-results" type="components:int"> - <xs:annotation> - <xs:documentation>The query page size</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="order" type="components:string"> - <xs:annotation> - <xs:documentation>The property to order results by</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="group-by" type="components:string"> - <xs:annotation> - <xs:documentation>The group-by clause</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> - - <xs:element name="ejbql" type="components:string"> - <xs:annotation> - <xs:documentation>The base query</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="order" type="components:string"> - <xs:annotation> - <xs:documentation>The property to order results by</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="group-by" type="components:string"> - <xs:annotation> - <xs:documentation>The group-by clause</xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element name="restrictions" type="components:multiValuedProperty"> - <xs:annotation> - <xs:documentation>Query restrictions (the WHERE clause)</xs:documentation> - </xs:annotation> - </xs:element> - - - - <xs:element name="entity-home"> - <xs:annotation> - <xs:documentation>A home controller for JPA entities</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="id" type="xs:string"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Home"/> - <xs:attributeGroup ref="framework:attlist.EntityHome"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.EntityHome"> - <xs:attribute name="entity-manager" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="hibernate-entity-home"> - <xs:annotation> - <xs:documentation>A home controller for Hibernate entities</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="id" type="xs:string"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:created-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:updated-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:deleted-message"/> - <xs:element minOccurs="0" maxOccurs="1" ref="framework:new-instance"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="framework:attlist.Home"/> - <xs:attributeGroup ref="framework:attlist.HibernateEntityHome"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateEntityHome"> - <xs:attribute name="session" type="components:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.Home"> - <xs:attribute name="entity-class" type="components:string"/> - <xs:attribute name="new-instance" type="components:expressionType"/> - <xs:attribute name="created-message" type="components:string"/> - <xs:attribute name="updated-message" type="components:string"/> - <xs:attribute name="deleted-message" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="created-message" type="components:string"> - <xs:annotation> - <xs:documentation>A faces message added when the home controller creates a new instance</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="updated-message" type="components:string"> - <xs:annotation> - <xs:documentation>A faces message added when the home controller updates an instance</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="deleted-message" type="components:string"> - <xs:annotation> - <xs:documentation>A faces message added when the home controller deletes an instance</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="new-instance" type="components:expressionType"> - <xs:annotation> - <xs:documentation>The new instance managed by a home controller</xs:documentation> - </xs:annotation> - </xs:element> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/international-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/international-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/international-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/international" xmlns:international="http://jboss.com/products/seam/international" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="locale-config"> - <xs:annotation> - <xs:documentation> - Locale configuration component. An alternative to configuring - the locale in the JSF configuration file. - </xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element name="supported-locales" type="components:multiValuedProperty"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="international:attlist.localeConfig"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.localeConfig"> - <xs:attribute name="default-locale" type="components:string"/> - <xs:attribute name="supported-locales" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="locale-selector"> - <xs:annotation> - <xs:documentation>The locale selector component</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="international:attlist.localeSelector"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.localeSelector"> - <xs:attribute name="locale-string" type="components:string" /> - <xs:attribute name="cookie-max-age" type="components:int" /> - <xs:attribute name="cookie-enabled" type="components:boolean" /> - </xs:attributeGroup> - - <xs:element name="time-zone-selector"> - <xs:annotation> - <xs:documentation>The time zone selector component</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="international:attlist.timeZoneSelector"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.timeZoneSelector"> - <xs:attribute name="time-zone-id" type="components:string" /> - <xs:attribute name="cookie-max-age" type="components:int" /> - <xs:attribute name="cookie-enabled" type="components:boolean" /> - </xs:attributeGroup> - - <xs:element name="time-zones"> - <xs:annotation> - <xs:documentation>The time zones provider component</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="international:attlist.timeZones"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.timeZones"> - <xs:attribute name="wrap" type="components:boolean" /> - </xs:attributeGroup> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/jms-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/jms-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/jms-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/jms" xmlns:jms="http://jboss.com/products/seam/jms" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="topic-connection"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.TopicConnection"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.TopicConnection"> - <xs:attribute name="topic-connection-factory-jndi-name" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="queue-connection"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.QueueConnection"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.QueueConnection"> - <xs:attribute name="queue-connection-factory-jndi-name" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="managed-topic-publisher"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.ManagedTopicPublisher"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedTopicPublisher"> - <xs:attribute name="topic-jndi-name" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="managed-queue-sender"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="jms:attlist.ManagedQueueSender"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedQueueSender"> - <xs:attribute name="queue-jndi-name" type="components:string"/> - </xs:attributeGroup> -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/mail-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/mail-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/mail-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/mail" - xmlns:mail="http://jboss.com/products/seam/mail" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="mail-session"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="mail:attlist.mailSession" /> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.mailSession"> - <xs:attribute name="username" type="components:string"/> - <xs:attribute name="password" type="components:string"/> - <xs:attribute name="host" type="components:string" default="localhost"/> - <xs:attribute name="port" type="components:string" /> - <xs:attribute name="debug" type="components:string" default="false" /> - <xs:attribute name="ssl" type="components:boolean" default="false" /> - <xs:attribute name="tls" type="components:boolean" default="true" /> - <xs:attribute name="session-jndi-name" type="components:string" /> - </xs:attributeGroup> - - - <xs:element name="meldware"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="users" type="components:multiValuedProperty" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - </xs:complexType> - </xs:element> - - <xs:element name="meldware-user"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="aliases" type="components:multiValuedProperty" /> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="mail:attlist.meldwareUser" /> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.meldwareUser"> - <xs:attribute name="username" type="components:string" /> - <xs:attribute name="password" type="components:string" /> - <xs:attribute name="administrator" type="components:boolean" default="false"/> - </xs:attributeGroup> -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/navigation-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/navigation-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/navigation-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/navigation" xmlns:navigation="http://jboss.com/products/seam/navigation" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="pages"> - <xs:annotation> - <xs:documentation>The pages component</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element name="resources" type="components:multiValuedProperty"> - <xs:annotation> - <xs:documentation> - A list of pages configuration files. Setting this value overrides the - default /WEB-INF/pages.xml. - </xs:documentation> - </xs:annotation> - </xs:element> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="navigation:attlist.pages"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.pages"> - <xs:attribute name="no-conversation-view-id" type="components:string" /> - <xs:attribute name="login-view-id" type="components:string" /> - <xs:attribute name="http-port" type="components:int" /> - <xs:attribute name="https-port" type="components:int" /> - </xs:attributeGroup> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pageflow-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pageflow-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pageflow-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,326 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema xmlns="http://jboss.com/products/seam/pageflow" - targetNamespace="http://jboss.com/products/seam/pageflow" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified"> - -  -  - <xs:element name="pageflow-definition"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="start-node-elements" /> - <xs:group ref="node-elements" /> - <xs:group ref="end-node-elements" /> - <xs:group ref="action-elements" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="start-page" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="start-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="transition" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="end-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - </xs:complexType> - </xs:element> - - <xs:element name="process-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="sub-process" /> - <xs:element ref="transition" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="binding" type="bindingType" /> - </xs:complexType> - </xs:element> - - <xs:element name="sub-process"> - <xs:complexType> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="version" type="xs:integer" /> - <xs:attribute name="binding" type="bindingType" /> - </xs:complexType> - </xs:element> - - <xs:element name="start-page"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="page-elements" /> - </xs:choice> - <xs:attributeGroup ref="page-attributes" /> - </xs:complexType> - </xs:element> - - <xs:element name="decision"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="handler" type="delegation" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - <xs:element name="transition"> - <xs:complexType> - <xs:choice minOccurs="0" - maxOccurs="unbounded"> - <xs:element name="condition"> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" - maxOccurs="unbounded"> - <xs:any processContents="lax" - minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="expression" - type="xs:string" /> - </xs:complexType> - </xs:element> - <xs:group ref="action-elements" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="to" type="xs:string" - use="required" /> - <xs:attribute name="name" type="xs:string" /> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="expression" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="page"> - <xs:complexType> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="end-conversation" /> - </xs:choice> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="end-task" /> - </xs:choice> - <xs:group ref="page-elements" /> - </xs:sequence> - <xs:attributeGroup ref="page-attributes" /> - </xs:complexType> - </xs:element> - - <xs:element name="redirect" /> - <xs:element name="description" type="xs:string" /> - - <xs:element name="end-conversation"> - <xs:complexType> - <xs:attribute name="before-redirect" type="booleanType" /> - <xs:attribute name="create-process" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="end-task"> - <xs:complexType> - <xs:attribute name="transition" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="transition"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="action-elements" /> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="to" type="xs:string" use="required" /> - <xs:attribute name="name" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="action"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="class" type="xs:string" /> - <xs:attribute name="config-type" default="field" type="xs:string" /> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="ref-name" type="xs:string" /> - <xs:attribute name="accept-propagated-events" - type="booleanType" default="true" /> - <xs:attribute name="expression" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="script"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="accept-propagated-events" - type="booleanType" default="true" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="event"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="action-elements" /> - </xs:choice> - <xs:attribute name="type" use="required"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="node-enter" /> - <xs:enumeration value="node-leave" /> - <xs:enumeration value="process-start" /> - <xs:enumeration value="process-end" /> - <xs:enumeration value="task-create" /> - <xs:enumeration value="task-assign" /> - <xs:enumeration value="task-start" /> - <xs:enumeration value="task-end" /> - <xs:enumeration value="before-signal" /> - <xs:enumeration value="after-signal" /> - </xs:restriction> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="exception-handler"> - <xs:complexType> - <xs:choice minOccurs="1" maxOccurs="unbounded"> - <xs:element ref="action" /> - <xs:element ref="script" /> - </xs:choice> - <xs:attribute name="exception-class" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:complexType name="delegation" mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" - maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="class" type="xs:string" /> - <xs:attribute name="config-type" default="field" type="xs:string" /> - </xs:complexType> - - <xs:simpleType name="configType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="field" /> - <xs:enumeration value="bean" /> - <xs:enumeration value="constructor" /> - <xs:enumeration value="configuration-property" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="booleanType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="yes" /> - <xs:enumeration value="no" /> - <xs:enumeration value="true" /> - <xs:enumeration value="false" /> - <xs:enumeration value="on" /> - <xs:enumeration value="off" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="enabledType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="enabled" /> - <xs:enumeration value="disabled" /> - </xs:restriction> - </xs:simpleType> - - <xs:group name="start-node-elements"> - <xs:choice> - <xs:element ref="start-state" /> - <xs:element ref="start-page" /> - </xs:choice> - </xs:group> - - <xs:group name="node-elements"> - <xs:choice> - <xs:element ref="page" /> - <xs:element ref="decision" /> - <xs:element ref="process-state" /> - </xs:choice> - </xs:group> - - <xs:group name="end-node-elements"> - <xs:choice> - <xs:element ref="end-state" /> - </xs:choice> - </xs:group> - - <xs:group name="action-elements"> - <xs:choice> - <xs:element ref="action" /> - <xs:element ref="script"/> - </xs:choice> - </xs:group> - - <xs:group name="page-elements"> - <xs:sequence> - <xs:element ref="description" maxOccurs="1" minOccurs="0"/> - <xs:element ref="redirect" maxOccurs="1" minOccurs="0"/> - <xs:element ref="event" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="exception-handler" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="transition" maxOccurs="unbounded" minOccurs="0"/> - <xs:group ref="action-elements" minOccurs="0" maxOccurs="1" /> - </xs:sequence> - </xs:group> - - <xs:attributeGroup name="page-attributes"> - <xs:attribute name="redirect" type="xs:boolean" /> - <xs:attribute name="switch" type="enabledType" /> - <xs:attribute name="no-conversation-view-id" type="xs:string" /> - <xs:attribute name="timeout" type="xs:int" /> - <xs:attribute name="back" type="enabledType" /> - <xs:attribute name="view-id" type="xs:string" use="required" /> - <xs:attribute name="name" type="xs:string" use="required" /> - </xs:attributeGroup> - - <xs:simpleType name="bindingType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="late" /> - <xs:enumeration value="early" /> - </xs:restriction> - </xs:simpleType> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pages-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pages-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/pages-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,643 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/pages" - xmlns:pages="http://jboss.com/products/seam/pages"> - - <xs:annotation> - <xs:documentation>About this format ...</xs:documentation> - </xs:annotation> - - <xs:element name="pages"> - <xs:annotation> - <xs:documentation>The root of a pages.xml file</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="pages:conversation"/> - <xs:element ref="pages:page"/> - <xs:element ref="pages:exception"/> - </xs:choice> - <xs:attributeGroup ref="pages:attlist.pages"/> - </xs:complexType> - <xs:key name="conversation-key"> - <xs:annotation> - <xs:documentation><p>You can read this as:</p> - <p>The pages element has a bunch of conversation elements, and for each of those conversation elements, they must have a unique name within this document.</p> - </xs:documentation> - </xs:annotation> - <xs:selector xpath="conversation"/> - <xs:field xpath="name"/> - </xs:key> - </xs:element> - - <xs:attributeGroup name="attlist.pages"> - <xs:attribute name="no-conversation-view-id" type="pages:view-id" /> - <xs:attribute name="login-view-id" type="pages:view-id"/> - <xs:attribute name="http-port" type="xs:unsignedLong"/> - <xs:attribute name="https-port" type="xs:unsignedLong"/> - </xs:attributeGroup> - - <xs:element name="exception"> - <xs:annotation> - <xs:documentation>A Seam exception handler</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:end-conversation"/> - <xs:choice> - <xs:element ref="pages:http-error"/> - <xs:element ref="pages:redirect"/> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.exception"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.exception"> - <xs:attribute name="class" type="xs:token"/> - <xs:attribute name="log" type="pages:tf-boolean"/> - <xs:attribute name="log-level" type="pages:loglevel-values"/> - -  - <xs:attribute name="logLevel" type="pages:loglevel-values"/> - </xs:attributeGroup> - - <xs:element name="conversation"> - <xs:annotation> - <xs:documentation>Natural conversation configuration</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.conversation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.conversation"> - <xs:attribute name="name" use="required" type="xs:token" /> - <xs:attribute name="parameter-name" use="required" type="xs:token" /> - <xs:attribute name="parameter-value" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="page"> - <xs:annotation> - <xs:documentation>Configuration for a specific page or set up pages</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="pages:restrict"/> - <xs:element ref="pages:description"/> - <xs:element ref="pages:param"/> - <xs:element ref="pages:header" /> - <xs:element ref="pages:rewrite" /> - <xs:element ref="pages:begin-conversation"/> - <xs:element ref="pages:end-conversation"/> - <xs:element ref="pages:start-task"/> - <xs:element ref="pages:begin-task"/> - <xs:element ref="pages:end-task"/> - <xs:element ref="pages:create-process"/> - <xs:element ref="pages:resume-process"/> - <xs:element ref="pages:in"/> - <xs:element ref="pages:raise-event"/> - <xs:element ref="pages:action"/> - <xs:element ref="pages:navigation"/> - </xs:choice> - <xs:attributeGroup ref="pages:attlist.page"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.page"> - <xs:attribute name="action" type="xs:token" /> - <xs:attribute name="view-id" type="pages:view-id"/> - <xs:attribute name="switch" default="enabled" type="pages:ableness"/> - <xs:attribute name="no-conversation-view-id" type="pages:view-id" /> - <xs:attribute name="conversation-required" default="false" type="pages:tf-boolean"/> - <xs:attribute name="login-required" default="false" type="pages:tf-boolean"/> - <xs:attribute name="scheme" type="pages:schemes" /> - <xs:attribute name="timeout" type="xs:unsignedLong" /> - <xs:attribute name="concurrent-request-timeout" type="xs:unsignedLong" > - <xs:annotation> - <xs:documentation> - Requests to conversations are serialized by default, and if - a lock cannot be acquired in time, the request will be - dropped. You can set the timeout on a page-by-page basis - here. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="bundle" type="xs:token" /> - <xs:attribute name="conversation" type="xs:token" /> - <xs:attribute name="expires" type="xs:unsignedLong" /> - <xs:attribute name="validate-model" default="true" type="pages:tf-boolean"/> - </xs:attributeGroup> - - <xs:element name="param"> - <xs:annotation> - <xs:documentation>A page parameter</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.param"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.param"> - <xs:attribute name="name" type="xs:token" /> - <xs:attribute name="value" type="xs:token" /> - <xs:attribute name="converter" type="xs:token" /> - <xs:attribute name="converterId" type="xs:token" /> - <xs:attribute name="validator" type="xs:token" /> - <xs:attribute name="validatorId" type="xs:token" /> - <xs:attribute name="required" type="pages:tf-boolean"/> - <xs:attribute name="validateModel" default="true" type="pages:tf-boolean"/> - </xs:attributeGroup> - - <xs:element name="header"> - <xs:annotation> - <xs:documentation>HTTP headers to be added</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.header"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.header"> - <xs:attribute name="name" use="required" type="xs:token" /> - <xs:attribute name="value" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="rewrite"> - <xs:annotation> - <xs:documentation>URL rewriting pattern for this view</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.rewrite"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.rewrite"> - <xs:attribute name="pattern" use="required" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="action"> - <xs:annotation> - <xs:documentation>Page action</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.action"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.action"> - <xs:attribute name="if" type="pages:boolean-value-expression" /> - <xs:attribute name="on-postback" default="true" type="pages:tf-boolean"/> - <xs:attribute name="execute" use="required" type="pages:method-expression" /> - </xs:attributeGroup> - - <xs:element name="restrict" type="pages:boolean-value-expression" default="true"> - <xs:annotation> - <xs:documentation>Security restrictions</xs:documentation> - </xs:annotation> - </xs:element> - - <xs:element name="navigation"> - <xs:annotation> - <xs:documentation>Page navigation</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:choice maxOccurs="2"> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:element ref="pages:begin-conversation"/> - <xs:element ref="pages:end-conversation"/> - <xs:element ref="pages:start-task"/> - <xs:element ref="pages:begin-task"/> - <xs:element ref="pages:end-task"/> - <xs:element ref="pages:create-process"/> - <xs:element ref="pages:resume-process"/> - </xs:choice> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> - <xs:element minOccurs="0" ref="pages:raise-event" maxOccurs="1"/> - <xs:choice minOccurs="0"> - <xs:element ref="pages:render"/> - <xs:element ref="pages:redirect"/> - </xs:choice> - </xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:rule"/> - </xs:choice> - <xs:attributeGroup ref="pages:attlist.navigation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.navigation"> - <xs:attribute name="from-action" type="pages:from-action-expression" /> - <xs:attribute name="evaluate" type="pages:method-expression" /> - </xs:attributeGroup> - - <xs:element name="rule"> - <xs:complexType> - <xs:sequence> - <xs:choice minOccurs="0"> - <xs:element ref="pages:begin-conversation"/> - <xs:element ref="pages:end-conversation"/> - <xs:element ref="pages:start-task"/> - <xs:element ref="pages:begin-task"/> - <xs:element ref="pages:end-task"/> - <xs:element ref="pages:create-process"/> - <xs:element ref="pages:resume-process"/> - </xs:choice> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:out"/> - <xs:element minOccurs="0" ref="pages:raise-event"/> - <xs:choice minOccurs="0"> - <xs:element ref="pages:render"/> - <xs:element ref="pages:redirect"/> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.rule"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.rule"> - <xs:attribute name="if-outcome" type="pages:outcome-expression" /> - <xs:attribute name="if" type="pages:boolean-value-expression" /> - </xs:attributeGroup> - - <xs:element name="raise-event"> - <xs:annotation> - <xs:documentation>Event to be raised</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.raise-event"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.raise-event"> - <xs:attribute name="type" use="required" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="begin-conversation"> - <xs:annotation> - <xs:documentation>This page begins a new conversation</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.begin-conversation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.begin-conversation"> - <xs:attribute name="join" default="false" type="pages:tf-boolean"/> - <xs:attribute name="nested" default="false" type="pages:tf-boolean"/> - <xs:attribute name="pageflow" type="xs:token" /> - <xs:attribute name="flush-mode" type="pages:flush-modes" /> - <xs:attribute name="if" type="pages:boolean-value-expression" /> - <xs:attribute name="conversation" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="end-conversation"> - <xs:annotation> - <xs:documentation>This page ends a conversation</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.end-conversation"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.end-conversation"> - <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean"/> - <xs:attribute name="root" default="false" type="pages:tf-boolean"/> - <xs:attribute name="if" type="pages:boolean-value-expression" /> - </xs:attributeGroup> - - <xs:element name="begin-task"> - <xs:annotation> - <xs:documentation>Begin a BPM task</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.begin-task"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.begin-task"> - <xs:attribute name="task-id" type="xs:token" /> - <xs:attribute name="pageflow" type="xs:token" /> - <xs:attribute name="flush-mode" type="pages:flush-modes" /> - </xs:attributeGroup> - - <xs:element name="start-task"> - <xs:annotation> - <xs:documentation>Start a BPM task</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.start-task"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.start-task"> - <xs:attribute name="task-id" type="xs:token" /> - <xs:attribute name="pageflow" type="xs:token" /> - <xs:attribute name="flush-mode" type="pages:flush-modes" /> - </xs:attributeGroup> - - <xs:element name="end-task"> - <xs:annotation> - <xs:documentation>Add a BPM task</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.end-task"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.end-task"> - <xs:attribute name="transition" type="xs:token" /> - <xs:attribute name="before-redirect" default="false" type="pages:tf-boolean" /> - </xs:attributeGroup> - - <xs:element name="create-process"> - <xs:annotation> - <xs:documentation>Create a BPM process</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.create-process"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.create-process"> - <xs:attribute name="definition" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="resume-process"> - <xs:annotation> - <xs:documentation>Resume a BPM process instance</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.resume-process"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.resume-process"> - <xs:attribute name="process-id" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="in"> - <xs:annotation> - <xs:documentation>A page input</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.in"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.in"> - <xs:attribute name="name" use="required" type="xs:token" /> - <xs:attribute name="scope" type="pages:allowed-scopes" /> - <xs:attribute name="value" use="required" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="out"> - <xs:annotation> - <xs:documentation>A contextual output for a navigation rule</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="pages:attlist.out"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.out"> - <xs:attribute name="name" use="required" type="xs:token" /> - <xs:attribute name="scope" default="CONVERSATION" type="pages:allowed-scopes" /> - <xs:attribute name="value" use="required" type="xs:token" /> - </xs:attributeGroup> - - <xs:element name="render"> - <xs:annotation> - <xs:documentation>Render a view</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:message"/> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.render"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.render"> - <xs:attribute name="view-id" type="pages:view-id-expression" /> - </xs:attributeGroup> - - <xs:element name="redirect"> - <xs:annotation> - <xs:documentation>Redirect to another view or URL</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:message"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="pages:param"/> - </xs:sequence> - - <xs:attributeGroup ref="pages:attlist.redirect"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.redirect"> - <xs:attribute name="view-id" type="pages:view-id-expression" /> - <xs:attribute name="url" type="pages:url-expression" /> - <xs:attribute name="include-page-params" type="pages:tf-boolean" /> - </xs:attributeGroup> - - <xs:element name="http-error"> - <xs:annotation> - <xs:documentation>Send an HTTP error code</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="pages:message"/> - </xs:sequence> - <xs:attributeGroup ref="pages:attlist.http-error"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.http-error"> - <xs:attribute name="error-code" use="required" type="xs:unsignedLong" /> - </xs:attributeGroup> - - <xs:element name="message"> - <xs:annotation> - <xs:documentation>Add a message to the faces messages</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attributeGroup ref="pages:attlist.message"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.message"> - <xs:attribute name="for" type="xs:token"/> - <xs:attribute name="severity" default="INFO" type="pages:loglevel-values" /> - </xs:attributeGroup> - - <xs:element name="description" type="xs:string"> - <xs:annotation> - <xs:documentation>A page description for workflow switching</xs:documentation> - </xs:annotation> - </xs:element> - - <xs:simpleType name="url"> - <xs:restriction base="xs:anyURI"> - <xs:pattern value="http://.*|https://.*"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="url-expression"> - <xs:union memberTypes="pages:url pages:method-expression"></xs:union> - </xs:simpleType> - - <xs:simpleType name="schemes"> - <xs:restriction base="xs:token"> - <xs:enumeration value="https"/> - <xs:enumeration value="http"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="outcome"> - <xs:restriction base="xs:string"> - <xs:pattern value="[^#\{\}]+"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="view-id"> - <xs:restriction base="xs:string"> - <xs:pattern value="(/.*)|\*"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="view-id-expression"> - <xs:union memberTypes="pages:view-id pages:value-expression"></xs:union> - </xs:simpleType> - - <xs:simpleType name="outcome-expression"> - <xs:union memberTypes="pages:outcome pages:value-expression"></xs:union> - </xs:simpleType> - - <xs:simpleType name="from-action-expression"> - <xs:union memberTypes="pages:outcome pages:method-expression"></xs:union> - </xs:simpleType> - - <xs:simpleType name="ableness"> - <xs:restriction base="xs:token"> - <xs:enumeration value="enabled"/> - <xs:enumeration value="disabled"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="tf-boolean"> - <xs:annotation> - <xs:documentation> - <p>Allows for the following values:</p> - <ul> - <li>true</li> - <li>false</li> - </ul> - </xs:documentation> - </xs:annotation> - <xs:restriction base="xs:boolean"> - <xs:pattern value="true"/> - <xs:pattern value="false"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="allowed-scopes"> - <xs:restriction base="xs:token"> - <xs:enumeration value="stateless"/> - <xs:enumeration value="event"/> - <xs:enumeration value="page"/> - <xs:enumeration value="conversation"/> - <xs:enumeration value="session"/> - <xs:enumeration value="business_process"/> - <xs:enumeration value="application"/> - <xs:enumeration value="STATELESS"/> - <xs:enumeration value="EVENT"/> - <xs:enumeration value="PAGE"/> - <xs:enumeration value="CONVERSATION"/> - <xs:enumeration value="SESSION"/> - <xs:enumeration value="BUSINESS_PROCESS"/> - <xs:enumeration value="APPLICATION"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="loglevel-values"> - <xs:restriction base="xs:token"> - <xs:enumeration value="info"/> - <xs:enumeration value="warn"/> - <xs:enumeration value="error"/> - <xs:enumeration value="fatal"/> - <xs:enumeration value="debug"/> - <xs:enumeration value="trace"/> - <xs:enumeration value="INFO"/> - <xs:enumeration value="WARN"/> - <xs:enumeration value="ERROR"/> - <xs:enumeration value="FATAL"/> - <xs:enumeration value="DEBUG"/> - <xs:enumeration value="TRACE"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="http-error-codes"> - <xs:annotation> - <xs:documentation><p><b>Note:</b> These do not include the HTTP extensions.</p></xs:documentation> - </xs:annotation> - <xs:restriction base="xs:token"> - <xs:enumeration value="100"/> - <xs:enumeration value="101"/> - <xs:enumeration value="200"/> - <xs:enumeration value="201"/> - <xs:enumeration value="202"/> - <xs:enumeration value="203"/> - <xs:enumeration value="204"/> - <xs:enumeration value="205"/> - <xs:enumeration value="206"/> - <xs:enumeration value="300"/> - <xs:enumeration value="301"/> - <xs:enumeration value="302"/> - <xs:enumeration value="303"/> - <xs:enumeration value="304"/> - <xs:enumeration value="305"/> - <xs:enumeration value="306"/> - <xs:enumeration value="307"/> - <xs:enumeration value="400"/> - <xs:enumeration value="401"/> - <xs:enumeration value="402"/> - <xs:enumeration value="403"/> - <xs:enumeration value="404"/> - <xs:enumeration value="405"/> - <xs:enumeration value="406"/> - <xs:enumeration value="407"/> - <xs:enumeration value="408"/> - <xs:enumeration value="409"/> - <xs:enumeration value="410"/> - <xs:enumeration value="411"/> - <xs:enumeration value="412"/> - <xs:enumeration value="413"/> - <xs:enumeration value="414"/> - <xs:enumeration value="415"/> - <xs:enumeration value="416"/> - <xs:enumeration value="417"/> - <xs:enumeration value="500"/> - <xs:enumeration value="501"/> - <xs:enumeration value="502"/> - <xs:enumeration value="503"/> - <xs:enumeration value="504"/> - <xs:enumeration value="505"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="flush-modes"> - <xs:restriction base="xs:token"> - <xs:enumeration value="manual"/> - <xs:enumeration value="auto"/> - <xs:enumeration value="commit"/> - <xs:enumeration value="MANUAL"/> - <xs:enumeration value="AUTO"/> - <xs:enumeration value="COMMIT"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="method-expression"> - <xs:restriction base="xs:token"> - <xs:pattern value="#\{.*\}"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="value-expression"> - <xs:restriction base="xs:token"> - <xs:pattern value="#\{.*\}"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="boolean-value-expression"> - <xs:restriction base="xs:token"> - <xs:pattern value="true|false|#\{.*\}"/> - </xs:restriction> - </xs:simpleType> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/persistence-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/persistence-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/persistence-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/persistence" xmlns:persistence="http://jboss.com/products/seam/persistence" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="managed-persistence-context"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="persistence:filters"/> - <xs:element ref="persistence:persistence-unit-jndi-name" /> - </xs:choice> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.ManagedPersistenceContext"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedPersistenceContext"> - <xs:attribute name="entity-manager-factory" type="components:expressionType"/> - <xs:attribute name="persistence-unit-jndi-name" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="managed-hibernate-session"> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" maxOccurs="1"> - <xs:element ref="persistence:filters"/> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.ManagedHibernateSession"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.ManagedHibernateSession"> - <xs:attribute name="session-factory"/> - <xs:attribute name="session-factory-jndi-name"/> - </xs:attributeGroup> - - <xs:element name="filters" type="components:multiValuedProperty"/> - <xs:element name="persistence-unit-jndi-name" type="components:string" /> - - <xs:element name="hibernate-session-factory"> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="mapping-classes" type="components:multiValuedProperty"/> - <xs:element name="mapping-files" type="components:multiValuedProperty"/> - <xs:element name="mapping-jars" type="components:multiValuedProperty"/> - <xs:element name="mapping-packages" type="components:multiValuedProperty"/> - <xs:element name="mapping-resources" type="components:multiValuedProperty"/> - <xs:element name="naming-strategy" type="components:expressionType"/> - <xs:element name="cfg-properties" type="components:mapProperty"/> - </xs:choice> - <xs:attributeGroup ref="persistence:attlist.HibernateSessionFactory"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateSessionFactory"> - <xs:attribute name="cfg-resource-name" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="entity-manager-factory"> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" maxOccurs="1"> - <xs:element name="persistence-unit-properties" type="components:mapProperty"/> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.EntityManagerFactory"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.EntityManagerFactory"> - <xs:attribute name="persistence-unit-name" type="components:string" /> - </xs:attributeGroup> - - <xs:element name="filter"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:element minOccurs="0" name="name" type="components:string"/> - <xs:element minOccurs="0" name="parameters" type="components:mapProperty"/> - </xs:sequence> - <xs:attributeGroup ref="persistence:attlist.filter"/> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.filter"> - <xs:attribute name="enabled" type="components:boolean" /> - </xs:attributeGroup> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/remoting-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/remoting-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/remoting-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/remoting" xmlns:remoting="http://jboss.com/products/seam/remoting" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="remoting"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="remoting:attlist.remoting"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.remoting"> - <xs:attribute name="poll-interval" type="components:int"/> - <xs:attribute name="poll-timeout" type="components:int" /> - <xs:attribute name="debug" type="components:boolean" /> - </xs:attributeGroup> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/security-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/security-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/security-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,157 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/security" xmlns:security="http://jboss.com/products/seam/security" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="identity"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.identity"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.identity"> - <xs:attribute name="authenticate-method" type="components:expressionType"/> - <xs:attribute name="remember-me" type="components:boolean"/> - <xs:attribute name="jaas-config-name" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="remember-me"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.remember-me"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.remember-me"> - <xs:attribute name="cookie-max-age" type="components:int"/> - <xs:attribute name="enabled" type="components:boolean"/> - <xs:attribute name="mode"> - <xs:simpleType> - <xs:restriction base="xs:token"> - <xs:enumeration value="disabled"/> - <xs:enumeration value="usernameOnly"/> - <xs:enumeration value="autoLogin"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:attributeGroup> - - <xs:element name="identity-manager"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.identity-manager"/> - </xs:complexType> - </xs:element> - - <xs:element name="jpa-identity-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.jpa-identity-store"/> - </xs:complexType> - </xs:element> - - <xs:element name="jpa-token-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.jpa-token-store"/> - </xs:complexType> - </xs:element> - - <xs:element name="ldap-identity-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.ldap-identity-store"/> - </xs:complexType> - </xs:element> - - <xs:element name="permission-manager"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.permission-manager"/> - </xs:complexType> - </xs:element> - - <xs:element name="jpa-permission-store"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.jpa-permission-store"/> - </xs:complexType> - </xs:element> - - <xs:element name="rule-based-permission-resolver"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.rule-based-permission-resolver"/> - </xs:complexType> - </xs:element> - - <xs:element name="persistent-permission-resolver"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="security:attlist.persistent-permission-resolver"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.identity-manager"> - <xs:attribute name="identity-store" type="components:expressionType"/> - <xs:attribute name="role-identity-store" type="components:expressionType"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.jpa-identity-store"> - <xs:attribute name="entity-manager" type="components:string"/> - <xs:attribute name="user-class" type="components:string" use="required"/> - <xs:attribute name="role-class" type="components:string"/> - <xs:attribute name="features" type="components:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.jpa-token-store"> - <xs:attribute name="entity-manager" type="components:string"/> - <xs:attribute name="token-class" type="components:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.ldap-identity-store"> - <xs:attribute name="server-address" type="components:string"/> - <xs:attribute name="server-port" type="components:string"/> - <xs:attribute name="bind-DN" type="components:string"/> - <xs:attribute name="bind-credentials" type="components:string"/> - <xs:attribute name="user-DN-prefix" type="components:string"/> - <xs:attribute name="user-DN-suffix" type="components:string"/> - <xs:attribute name="role-DN-prefix" type="components:string"/> - <xs:attribute name="role-DN-suffix" type="components:string"/> - <xs:attribute name="user-context-DN" type="components:string"/> - <xs:attribute name="role-context-DN" type="components:string"/> - <xs:attribute name="user-role-attribute" type="components:string"/> - <xs:attribute name="user-name-attribute" type="components:string"/> - <xs:attribute name="role-name-attribute" type="components:string"/> - <xs:attribute name="role-attribute-is-DN" type="components:boolean"/> - <xs:attribute name="user-object-classes" type="components:string"/> - <xs:attribute name="role-object-classes" type="components:string"/> - <xs:attribute name="enabled-attribute" type="components:string"/> - <xs:attribute name="search-scope" type="components:string"/> - <xs:attribute name="first-name-attribute" type="components:string"/> - <xs:attribute name="last-name-attribute" type="components:string"/> - <xs:attribute name="user-password-attribute" type="components:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.permission-manager"> - <xs:attribute name="permission-store" type="components:expressionType"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.jpa-permission-store"> - <xs:attribute name="entity-manager" type="components:string"/> - <xs:attribute name="user-permission-class" type="components:string"/> - <xs:attribute name="role-permission-class" type="components:string"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.rule-based-permission-resolver"> - <xs:attribute name="security-rules" type="components:expressionType"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.persistent-permission-resolver"> - <xs:attribute name="permission-store" type="components:expressionType"/> - </xs:attributeGroup> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/theme-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/theme-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/theme-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/theme" xmlns:theme="http://jboss.com/products/seam/theme" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="theme-selector"> - <xs:annotation> - <xs:documentation>Theme selector component</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element name="available-themes" type="components:multiValuedProperty"/> - </xs:choice> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="theme:attlist.themeSelector"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.themeSelector"> - <xs:attribute name="theme" type="components:string"/> - <xs:attribute name="available-themes" type="components:string"/> - <xs:attribute name="cookie-max-age" type="components:int"/> - <xs:attribute name="cookie-enabled" type="components:boolean" /> - </xs:attributeGroup> -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/transaction-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/transaction-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/transaction-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/transaction" xmlns:transaction="http://jboss.com/products/seam/transaction" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="ejb-transaction"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="components:attlist.ejbcomponent"/> - <xs:attributeGroup ref="transaction:attlist.transaction"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.transaction"> </xs:attributeGroup> - - <xs:element name="hibernate-transaction"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="transaction:attlist.HibernateTransaction"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.HibernateTransaction"> - <xs:attribute name="session" type="components:string" use="required"/> - </xs:attributeGroup> - - <xs:element name="entity-transaction"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="transaction:attlist.EntityTransaction"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.EntityTransaction"> - <xs:attribute name="entity-manager" type="components:string" use="required"/> - </xs:attributeGroup> - - <xs:element name="no-transaction"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - </xs:complexType> - </xs:element> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/ui-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/ui-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/ui-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/ui" - xmlns:ui="http://jboss.com/products/seam/ui" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="jpa-entity-loader"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attribute name="entity-manager" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="hibernate-entity-loader"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attribute name="session" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="entity-converter"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attribute name="entity-loader" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="render-stamp-store"> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attribute name="max-size" type="xs:int" /> - </xs:complexType> - </xs:element> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/web-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/web-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/web-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,199 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/web" xmlns:web="http://jboss.com/products/seam/web" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="hot-deploy-filter"> - <xs:annotation> - <xs:documentation>This filter triggers a scan for hot deployable components and descriptor files on each request. The URL pattern should be set to the same pattern as used by the Faces Servlet. Note that this filter is automatically disabled when Seam debug mode is disabled.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="identity-filter"> - <xs:annotation> - <xs:documentation>This filter provides integration between Servlet Security and the identity component.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="multipart-filter"> - <xs:annotation> - <xs:documentation> - Detects multipart form requests and processes them according to the - multipart/form-data specification (RFC-2388). - </xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.multipartFilter"/> - </xs:complexType> - </xs:element> - - <xs:element name="redirect-filter"> - <xs:annotation> - <xs:documentation>This filter allows Seam to propagate the conversation context across browser redirects. It intercepts any -browser redirects and adds a request parameter that specifies the Seam conversation identifier.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="exception-filter"> - <xs:annotation> - <xs:documentation>This filter provides the exception mapping functionality in pages.xml.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="context-filter"> - <xs:annotation> - <xs:documentation>This filter allows custom servlets to interact with the Seam contexts. It sets up the Seam contexts at the begin- -ning of each request, and tears them down at the end of the request.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="wicket-filter"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.wicketFilter"/> - </xs:complexType> - </xs:element> - - <xs:element name="character-encoding-filter"> - <xs:annotation> - <xs:documentation>Sets the character encoding of submitted form data.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="encoding" type="components:string"/> - <xs:attribute name="override-client" type="components:boolean"/> - </xs:complexType> - </xs:element> - - <xs:element name="authentication-filter"> - <xs:annotation> - <xs:documentation>Although not recommended for use unless absolutely necessary, Seam provides means for authenticating using -either HTTP Basic or HTTP Digest (RFC 2617) methods.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="realm" type="components:string"/> - <xs:attribute name="key" type="components:string"/> - <xs:attribute name="nonce-validity-seconds" type="components:int"/> - <xs:attribute name="auth-type" type="components:string"/> - </xs:complexType> - </xs:element> - - <xs:element name="logging-filter"> - <xs:annotation> - <xs:documentation>This filter adds the authenticated user name to the log4j mapped diagnostic context so that it can be included in -formatted log output if desired, by adding %X{username} to the pattern.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - </xs:complexType> - </xs:element> - - <xs:element name="ajax4jsf-filter"> - <xs:annotation> - <xs:documentation>The ajax4jsf filter for RichFaces</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attributeGroup ref="web:attlist.ajax4jsfFilter"/> - </xs:complexType> - </xs:element> - - <xs:element name="rewrite-filter"> - <xs:annotation> - <xs:documentation>This filter performs URL rewriting.</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:rewrite.filter"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.filter"> - <xs:attribute name="url-pattern" type="components:string"/> - <xs:attribute name="regex-url-pattern" type="components:string"/> - <xs:attribute name="disabled" type="components:boolean" default="false" /> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.wicketFilter"> - <xs:attribute name="application-class" type="components:string"/> - <xs:attribute name="application-factory-class" type="components:string"/> - <xs:attribute name="detect-portlet-context" type="components:boolean" default="false" /> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.multipartFilter"> - <xs:attribute name="create-temp-files" type="components:boolean" /> - <xs:attribute name="max-request-size" type="components:int"/> - </xs:attributeGroup> - - <xs:attributeGroup name="attlist.ajax4jsfFilter"> - <xs:attribute name="enable-cache" type="components:boolean" /> - <xs:attribute name="force-parser" type="components:boolean" /> - <xs:attribute name="log4j-init-file" type="components:string"/> - </xs:attributeGroup> - - <xs:element name="session"> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.session"/> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.session"> - <xs:attribute name="invalidate-on-scheme-change" type="components:boolean"/> - </xs:attributeGroup> - - <xs:attributeGroup name="rewrite.filter"> - <xs:attribute name="view-mapping" type="components:string"> - <xs:annotation> - <xs:documentation> - This is the servlet mapping. It should be set to the same pattern as used by the - Faces Servlet. If no value is specified, a pattern of *.seam will be assumed. - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> - - <xs:element name="cache-control-filter"> - <xs:annotation> - <xs:documentation>Sets the HTTP Cache-Control header</xs:documentation> - </xs:annotation> - <xs:complexType mixed="true"> - <xs:attributeGroup ref="components:attlist.component"/> - <xs:attributeGroup ref="web:attlist.filter"/> - <xs:attribute name="value" type="components:string"/> - </xs:complexType> - </xs:element> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/wicket-2.3.xsd =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/wicket-2.3.xsd 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/main/resources/org/jboss/seam/wicket-2.3.xsd 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/seam/wicket" - xmlns:wicket="http://jboss.com/products/seam/wicket" - xmlns:components="http://jboss.com/products/seam/components" attributeFormDefault="unqualified"> - - <xs:import namespace="http://jboss.com/products/seam/components" schemaLocation="components-2.3.xsd"/> - - <xs:element name="web-application"> - <xs:annotation> - <xs:documentation></xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:attributeGroup ref="components:attlist.component" /> - <xs:attributeGroup ref="wicket:attlist.webApplication" /> - </xs:complexType> - </xs:element> - - <xs:attributeGroup name="attlist.webApplication"> - <xs:attribute name="application-class" type="components:string" /> - </xs:attributeGroup> - -</xs:schema> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/META-INF/pagesForPageActionsTest.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/META-INF/pagesForPageActionsTest.xml 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/META-INF/pagesForPageActionsTest.xml 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages - http://jboss.com/products/seam/pages-2.3.xsd"> - - <page view-id="/action-test01a.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - </page> - - <page view-id="/action-test01b.xhtml" action="#{testActions.nonNullActionA}"> - <description>#{fineDescription}</description> - <action execute="#{testActions.nonNullActionB}" /> - </page> - - <page view-id="/action-test01*"> - <description>coarse-description</description> - <navigation from-action="#{testActions.nonNullActionA}"> - <rule if-outcome="outcomeA"> - <render view-id="/pageA.xhtml" /> - </rule> - </navigation> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test02.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - <action execute="#{testActions.nonNullActionC}" /> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test03.xhtml"> - <action execute="#{testActions.nullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - - <navigation from-action="#{testActions.nullActionA}"> - <render view-id="/pageA.xhtml"/> - </navigation> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test04.xhtml"> - <action execute="#{testActions.nullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - <action execute="#{testActions.nonNullActionC}" /> - - <navigation> - <rule> - <render view-id="/action-test04.xhtml"/> - </rule> - </navigation> - </page> - - <page view-id="/action-test05.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - - <navigation from-action="#{testActions.nonNullActionA}"> - <rule if-outcome="outcomeA"> - <redirect view-id="/pageA.xhtml" /> - </rule> - </navigation> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <redirect view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test06.xhtml"> - <action execute="#{testActions.nonNullActionA}"/> - <action execute="#{testActions.nonNullActionB}" on-postback="false"/> - </page> - -  - <page view-id="/action-test99a.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - - <navigation from-action="#{testActions.nonNullActionA}"> - <rule if-outcome="outcomeA"> - <render view-id="/action-test99b.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test99b.xhtml"> - <action execute="#{testActions.nonNullActionC}" /> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/end-conversation-test.xhtml"> - <end-conversation /> - </page> - - <page view-id="/end-root-conversation-test.xhtml"> - <end-conversation root="true" /> - </page> - -</pages> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/META-INF/seam.properties =================================================================== Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/AbstractPageTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/AbstractPageTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/AbstractPageTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,91 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.util.HashMap; -import java.util.Map; - -import org.jboss.seam.Component; -import org.jboss.seam.Seam; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.FacesLifecycle; -import org.jboss.seam.contexts.Lifecycle; -import org.jboss.seam.core.Expressions; -import org.jboss.seam.core.Init; -import org.jboss.seam.core.Interpolator; -import org.jboss.seam.core.Locale; -import org.jboss.seam.core.ResourceLoader; -import org.jboss.seam.mock.MockApplication; -import org.jboss.seam.mock.MockExternalContext; -import org.jboss.seam.mock.MockFacesContext; -import org.jboss.seam.navigation.Pages; -import org.jboss.seam.util.Conversions; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; - -/** - * Abstract class that provides the setup and tear-down necessary to initialize the context for performing tests - * against the Pages component. - */ -public abstract class AbstractPageTest -{ - private static final String TEST_PAGES_DOT_XML = "/META-INF/pagesForPageActionsTest.xml"; - - @BeforeMethod - public void setup() - { - // create main application map - Lifecycle.beginApplication(new HashMap<String, Object>()); - - // start all the contexts - Lifecycle.beginCall(); - - // establish the FacesContext - new MockFacesContext(new MockExternalContext(), new MockApplication()).setCurrent().createViewRoot(); - FacesLifecycle.resumePage(); - - // install key components - installComponents(Contexts.getApplicationContext()); - - // initialize pages - // the descriptor file locations are set using the property: org.jboss.seam.navigation.pages.resources - // this setup of this test sets this property value to: /META-INF/pagesForPageActionsTest.xml - Pages.instance(); - - // mark the application as started - Lifecycle.setupApplication(); - } - - @AfterMethod - public void tearDown() - { - Lifecycle.endApplication(); - Lifecycle.cleanupApplication(); - } - - protected void installComponents(Context appContext) - { - Init init = new Init(); - init.setTransactionManagementEnabled(false); - appContext.set(Seam.getComponentName(Init.class), init); - Map<String, Conversions.PropertyValue> properties = new HashMap<String, Conversions.PropertyValue>(); - appContext.set(Component.PROPERTIES, properties); - properties.put(Seam.getComponentName(Pages.class) + ".resources", new Conversions.FlatPropertyValue(TEST_PAGES_DOT_XML)); - - installComponent(appContext, ResourceLoader.class); - installComponent(appContext, Expressions.class); - installComponent(appContext, Pages.class); - installComponent(appContext, Interpolator.class); - installComponent(appContext, Locale.class); - } - - /** - * Installs a component for use in the current test context. - * - * @param appContext - * @param clazz - */ - protected void installComponent(Context appContext, Class clazz) - { - appContext.set(Seam.getComponentName(clazz) + ".component", new Component(clazz)); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Action.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Action.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Action.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,14 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; - -@Name("action") -public class Action { - - @In(create=true) String name; - - public String go() { - return "success"; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Bar.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Bar.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Bar.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,70 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.test.unit; - -import java.io.Serializable; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.Conversational; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute </a> - */ -@Name("bar") -(a)Scope(ScopeType.CONVERSATION) -@Conversational -public class Bar implements Serializable -{ - private static final long serialVersionUID = -5325217160542604204L; - - @In(required=true) - Foo otherFoo; - - @In(create=true) - Foo foo; - - @Out(required=false) - String string; - - @Out(required=false, scope=ScopeType.EVENT) - String otherString; - - @Begin - public String begin() - { - return "begun"; - } - - public String foo() - { - string = "out"; - otherString = "outAgain"; - return "foo"; - } - - @End - public String end() - { - return "ended"; - } - - @Destroy - public void destroy(){} - @Create - public void create(){} - -} - - Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/BrokenAction.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/BrokenAction.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/BrokenAction.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,15 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; - -@Name("brokenAction") -public class BrokenAction { - - @In String name; - - public String go() { - return "success"; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ComponentTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ComponentTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ComponentTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,142 +0,0 @@ -//$Id: ComponentTest.java 6435 2007-10-08 18:15:49Z pmuir $ -package org.jboss.seam.test.unit; - -import org.jboss.seam.Component; -import org.jboss.seam.ComponentType; -import org.jboss.seam.ScopeType; -import org.jboss.seam.Seam; -import org.jboss.seam.core.Init; -import org.jboss.seam.core.Manager; -import org.jboss.seam.persistence.ManagedHibernateSession; -import org.jboss.seam.persistence.ManagedPersistenceContext; -import org.testng.annotations.Test; - -public class ComponentTest -{ - @Test - public void testStaticMethods() - { - assert Seam.getComponentName(Bar.class).equals("bar"); - assert Seam.getComponentType(Bar.class)==ComponentType.JAVA_BEAN; - assert Seam.getComponentScope(Bar.class)==ScopeType.CONVERSATION; - assert Seam.getComponentName(Foo.class).equals("foo"); - assert Seam.getComponentType(Foo.class)==ComponentType.JAVA_BEAN; - assert Seam.getComponentScope(Foo.class)==ScopeType.SESSION; - //assert Seam.getBeanClass(Foo.class)==Foo.class; - assert Seam.getEjbName(EjbBean.class).equals("EjbBean"); - assert Seam.getEjbName(Foo.class)==null; - assert Seam.isInterceptionEnabled(Foo.class)==true; - } - - @Test - public void testComponent() - { - Component c = new Component(Bar.class); - assert c.getName().equals("bar"); - assert c.getBeanClass()==Bar.class; - assert c.getType()==ComponentType.JAVA_BEAN; - assert c.getScope()==ScopeType.CONVERSATION; - assert c.hasDestroyMethod(); - assert c.hasCreateMethod(); - assert c.getCreateMethod().getName().equals("create"); - assert c.getDestroyMethod().getName().equals("destroy"); - assert c.getInAttributes().size()==2; - assert c.getUnwrapMethod()==null; - assert c.getOutAttributes().size()==2; - assert c.getRemoveMethods().size()==0; - assert c.isInstance( new Bar() ); - - c = new Component(Foo.class); - assert c.getName().equals("foo"); - assert c.getBeanClass()==Foo.class; - assert c.getType()==ComponentType.JAVA_BEAN; - assert c.getScope()==ScopeType.SESSION; - assert !c.hasDestroyMethod(); - assert !c.hasCreateMethod(); - assert c.getCreateMethod()==null; - assert c.getDestroyMethod()==null; - assert c.getInAttributes().size()==0; - assert c.getUnwrapMethod()==null; - assert c.getOutAttributes().size()==0; - assert c.getRemoveMethods().size()==1; - assert c.isInstance( new Foo() ); - - c = new Component(EjbBean.class); - assert c.getName().equals("ejb"); - assert c.getBeanClass()==EjbBean.class; - assert c.getType()==ComponentType.STATEFUL_SESSION_BEAN; - assert c.getScope()==ScopeType.EVENT; - assert c.hasDestroyMethod(); - assert !c.hasDefaultRemoveMethod(); - assert !c.hasCreateMethod(); - assert c.getCreateMethod()==null; - assert c.getDestroyMethod()!=null; - assert c.getDefaultRemoveMethod()==null; - assert c.getInAttributes().size()==0; - assert c.getUnwrapMethod()==null; - assert c.getOutAttributes().size()==0; - assert c.getRemoveMethods().size()==1; - assert c.isInstance( new Ejb() { - public void destroy() {} - public void foo() {} - } ); - } - - public void testBuiltInComponents() - { - Component c = new Component(Manager.class); - assert c.getName().equals("org.jboss.seam.conversationManager"); - assert c.getBeanClass()==Manager.class; - assert c.getType()==ComponentType.JAVA_BEAN; - assert c.getScope()==ScopeType.EVENT; - assert c.hasDestroyMethod(); - assert !c.hasCreateMethod(); - assert c.getCreateMethod()==null; - assert c.getDestroyMethod().getName().equals("destroy"); - assert c.getInAttributes().size()==0; - assert c.getUnwrapMethod()==null; - assert c.getOutAttributes().size()==0; - assert c.getRemoveMethods().size()==0; - - c = new Component(Init.class); - assert c.getName().equals("org.jboss.seam.settings"); - assert c.getBeanClass()==Init.class; - assert c.getType()==ComponentType.JAVA_BEAN; - assert c.getScope()==ScopeType.APPLICATION; - assert !c.hasDestroyMethod(); - assert !c.hasCreateMethod(); - assert c.getCreateMethod()==null; - assert c.getDestroyMethod()==null; - assert c.getInAttributes().size()==0; - assert c.getUnwrapMethod()==null; - assert c.getOutAttributes().size()==0; - assert c.getRemoveMethods().size()==0; - c = new Component(ManagedPersistenceContext.class, "pc"); - assert c.getName().equals("pc"); - assert c.getBeanClass()==ManagedPersistenceContext.class; - assert c.getType()==ComponentType.JAVA_BEAN; - assert c.getScope()==ScopeType.CONVERSATION; - assert c.hasDestroyMethod(); - assert c.hasCreateMethod(); - assert c.getCreateMethod().getName().equals("create"); - assert c.getDestroyMethod().getName().equals("destroy"); - assert c.getInAttributes().size()==0; - assert c.getUnwrapMethod().getName().equals("getEntityManager"); - assert c.getOutAttributes().size()==0; - assert c.getRemoveMethods().size()==0; - - c = new Component(ManagedHibernateSession.class, "pc"); - assert c.getName().equals("pc"); - assert c.getBeanClass()==ManagedHibernateSession.class; - assert c.getType()==ComponentType.JAVA_BEAN; - assert c.getScope()==ScopeType.CONVERSATION; - assert c.hasDestroyMethod(); - assert c.hasCreateMethod(); - assert c.getCreateMethod().getName().equals("create"); - assert c.getDestroyMethod().getName().equals("destroy"); - assert c.getInAttributes().size()==0; - assert c.getUnwrapMethod().getName().equals("getSession"); - assert c.getOutAttributes().size()==0; - assert c.getRemoveMethods().size()==0; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ContextTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ContextTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ContextTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,287 +0,0 @@ -//$Id: ContextTest.java 11208 2009-06-25 14:55:53Z manaRH $ -package org.jboss.seam.test.unit; - -import java.util.Map; - -import javax.el.ELContext; -import javax.faces.context.ExternalContext; -import javax.servlet.http.HttpServletRequest; - -import org.jboss.seam.Component; -import org.jboss.seam.Namespace; -import org.jboss.seam.Seam; -import org.jboss.seam.contexts.ApplicationContext; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.EventContext; -import org.jboss.seam.contexts.FacesLifecycle; -import org.jboss.seam.contexts.ServerConversationContext; -import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.contexts.SessionContext; -import org.jboss.seam.core.ConversationEntries; -import org.jboss.seam.core.Init; -import org.jboss.seam.core.Manager; -import org.jboss.seam.el.EL; -import org.jboss.seam.el.SeamELResolver; -import org.jboss.seam.mock.MockExternalContext; -import org.jboss.seam.mock.MockHttpServletRequest; -import org.jboss.seam.mock.MockHttpSession; -import org.jboss.seam.mock.MockServletContext; -import org.jboss.seam.servlet.ServletRequestMap; -import org.jboss.seam.servlet.ServletRequestSessionMap; -import org.jboss.seam.web.Parameters; -import org.jboss.seam.web.ServletContexts; -import org.jboss.seam.web.Session; -import org.testng.Assert; -import org.testng.annotations.Test; - -public class ContextTest { - private void installComponent(Context appContext, Class clazz) { - appContext.set(Seam.getComponentName(clazz) + ".component", - new Component(clazz)); - } - - @Test - public void testContextManagement() throws Exception { - ELContext elContext = EL.createELContext(); - SeamELResolver seamVariableResolver = new SeamELResolver(); - // org.jboss.seam.bpm.SeamVariableResolver jbpmVariableResolver = new - // org.jboss.seam.bpm.SeamVariableResolver(); - - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockExternalContext externalContext = new MockExternalContext( - servletContext); - Context appContext = new ApplicationContext(externalContext - .getApplicationMap()); - // appContext.set( Seam.getComponentName(Init.class), new Init() ); - installComponent(appContext, ConversationEntries.class); - installComponent(appContext, Manager.class); - installComponent(appContext, Session.class); - installComponent(appContext, ServletContexts.class); - installComponent(appContext, Parameters.class); - appContext.set(Seam.getComponentName(Init.class), new Init()); - - installComponent(appContext, Bar.class); - installComponent(appContext, Foo.class); - appContext.set("otherFoo", new Foo()); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isConversationContextActive(); - assert !Contexts.isApplicationContextActive(); - - FacesLifecycle.beginRequest(externalContext); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert !Contexts.isConversationContextActive(); - assert Contexts.isApplicationContextActive(); - - Manager.instance().setCurrentConversationId("3"); - FacesLifecycle.resumeConversation(externalContext); - Manager.instance().setLongRunningConversation(true); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isConversationContextActive(); - assert Contexts.isApplicationContextActive(); - assert !Contexts.isPageContextActive(); - - assert Contexts.getEventContext() != null; - assert Contexts.getSessionContext() != null; - assert Contexts.getConversationContext() != null; - assert Contexts.getApplicationContext() != null; - assert Contexts.getEventContext() instanceof EventContext; - assert Contexts.getSessionContext() instanceof SessionContext; - assert Contexts.getConversationContext() instanceof ServerConversationContext; - assert Contexts.getApplicationContext() instanceof ApplicationContext; - - Contexts.getSessionContext().set("zzz", "bar"); - Contexts.getApplicationContext().set("zzz", "bar"); - Contexts.getConversationContext().set("xxx", "yyy"); - - Object bar = seamVariableResolver.getValue(elContext, null, "bar"); - assert bar != null; - assert bar instanceof Bar; - assert Contexts.getConversationContext().get("bar") == bar; - Object foo = Contexts.getSessionContext().get("foo"); - assert foo != null; - assert foo instanceof Foo; - - FacesLifecycle.endRequest(externalContext); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isConversationContextActive(); - assert !Contexts.isApplicationContextActive(); - assert ((MockHttpSession) externalContext.getSession(false)) - .getAttributes().size() == 4; - assert ((MockServletContext) externalContext.getContext()) - .getAttributes().size() == 12; - - FacesLifecycle.beginRequest(externalContext); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert !Contexts.isConversationContextActive(); - assert Contexts.isApplicationContextActive(); - - Manager.instance().setCurrentConversationId("3"); - FacesLifecycle.resumeConversation(externalContext); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isConversationContextActive(); - assert Contexts.isApplicationContextActive(); - - assert Contexts.getEventContext() != null; - assert Contexts.getSessionContext() != null; - assert Contexts.getConversationContext() != null; - assert Contexts.getApplicationContext() != null; - assert Contexts.getEventContext() instanceof EventContext; - assert Contexts.getSessionContext() instanceof SessionContext; - assert Contexts.getConversationContext() instanceof ServerConversationContext; - assert Contexts.getApplicationContext() instanceof ApplicationContext; - - assert Contexts.getSessionContext().get("zzz").equals("bar"); - assert Contexts.getApplicationContext().get("zzz").equals("bar"); - assert Contexts.getConversationContext().get("xxx").equals("yyy"); - assert Contexts.getConversationContext().get("bar") == bar; - assert Contexts.getSessionContext().get("foo") == foo; - - assert Contexts.getConversationContext().getNames().length == 2; - assert Contexts.getApplicationContext().getNames().length == 12; - assert Contexts.getSessionContext().getNames().length == 2; - - assert seamVariableResolver.getValue(elContext, null, "zzz").equals( - "bar"); - assert seamVariableResolver.getValue(elContext, null, "xxx").equals( - "yyy"); - assert seamVariableResolver.getValue(elContext, null, "bar") == bar; - assert seamVariableResolver.getValue(elContext, null, "foo") == foo; - - // JBSEAM-3077 - assert EL.EL_RESOLVER.getValue(elContext, new Namespace("org.jboss.seam.core."), "conversationEntries") instanceof ConversationEntries; - try { - assert EL.EL_RESOLVER.getValue(elContext, new Namespace("org.jboss.seam."), "caughtException") == null; - } catch (Exception e) { - Assert.fail("An exception should not be thrown when a qualified name resolves to null", e); - } - - /* - * assert jbpmVariableResolver.resolveVariable("zzz").equals("bar"); - * assert jbpmVariableResolver.resolveVariable("xxx").equals("yyy"); - * assert jbpmVariableResolver.resolveVariable("bar")==bar; assert - * jbpmVariableResolver.resolveVariable("foo")==foo; - */ - - Manager.instance().setLongRunningConversation(false); - FacesLifecycle.endRequest(externalContext); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isConversationContextActive(); - assert !Contexts.isApplicationContextActive(); - assert ((MockHttpSession) externalContext.getSession(false)) - .getAttributes().size() == 3; // foo, zzz, org.jboss.seam.core.conversationEntries - assert ((MockServletContext) externalContext.getContext()) - .getAttributes().size() == 12; - - ServletLifecycle.endSession(((HttpServletRequest) externalContext - .getRequest()).getSession()); - - ServletLifecycle.endApplication(); - - } - - @Test - public void testContexts() { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockHttpSession session = new MockHttpSession(servletContext); - MockHttpServletRequest request = new MockHttpServletRequest(session); - final ExternalContext externalContext = new MockExternalContext( - servletContext, request); - final Map sessionAdaptor = new ServletRequestSessionMap(request); - Map requestAdaptor = new ServletRequestMap(request); - Context appContext = new ApplicationContext(externalContext - .getApplicationMap()); - installComponent(appContext, ConversationEntries.class); - installComponent(appContext, Manager.class); - appContext.set(Seam.getComponentName(Init.class), new Init()); - FacesLifecycle.beginRequest(externalContext); - Manager.instance().setLongRunningConversation(true); - testContext(new ApplicationContext(externalContext.getApplicationMap())); - testContext(new SessionContext(sessionAdaptor)); - testContext(new EventContext(requestAdaptor)); - testContext(new ServerConversationContext(sessionAdaptor, "1")); - testEquivalence(new ContextCreator() { - public Context createContext() { - return new ServerConversationContext(sessionAdaptor, "1"); - } - }); - testEquivalence(new ContextCreator() { - public Context createContext() { - return new SessionContext(sessionAdaptor); - } - }); - testEquivalence(new ContextCreator() { - public Context createContext() { - return new ApplicationContext(externalContext.getApplicationMap()); - } - }); - testIsolation(new ServerConversationContext(sessionAdaptor, "1"), - new ServerConversationContext(sessionAdaptor, "2")); - // testIsolation( new WebSessionContext(externalContext), new - // WebSessionContext( new MockExternalContext()) ); - - ServletLifecycle.endApplication(); - } - - private interface ContextCreator { - Context createContext(); - } - - private void testEquivalence(ContextCreator creator) { - //Creates a new context for each action to better simulate these operations - //happening in different call contexts. - { //Test Adding - Context ctx = creator.createContext(); - ctx.set("foo", "bar"); - ctx.flush(); - } - { //Is Added? - Context ctx = creator.createContext(); - assert ctx.get("foo").equals("bar"); - } - { // Test Removing - Context ctx = creator.createContext(); - ctx.remove("foo"); - ctx.flush(); - } - { // Is Removed? - Context ctx = creator.createContext(); - assert !ctx.isSet("foo"); - } - } - - private void testIsolation(Context ctx, Context cty) { - ctx.set("foo", "bar"); - ctx.flush(); - assert !cty.isSet("foo"); - cty.set("foo", "bar"); - ctx.remove("foo"); - ctx.flush(); - assert cty.get("foo").equals("bar"); - } - - private void testContext(Context ctx) { - assert !ctx.isSet("foo"); - ctx.set("foo", "bar"); - assert ctx.isSet("foo"); - assert ctx.get("foo").equals("bar"); - ctx.remove("foo"); - assert !ctx.isSet("foo"); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CoreTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CoreTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CoreTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,25 +0,0 @@ -//$Id: CoreTest.java 6849 2007-11-28 23:37:36Z dallen $ -package org.jboss.seam.test.unit; - -import java.util.HashMap; - -import org.jboss.seam.contexts.Lifecycle; -import org.jboss.seam.init.Initialization; -import org.jboss.seam.mock.MockServletContext; -import org.testng.annotations.BeforeSuite; - -public class CoreTest -{ - /** - * The purpose of this test (any why it wraps the suite) is to trigger - * a component scan to ensure that it can execute without errors. That - * allows the other tests to execute knowing that the environment is sane. - */ - @BeforeSuite - public void triggerComponentScan() - { - Lifecycle.beginApplication(new HashMap<String, Object>()); - new Initialization(new MockServletContext()).create().init(); - Lifecycle.endApplication(); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicBar.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicBar.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicBar.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,22 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Factory; - -@Name("cyclicBar") -(a)Scope(ScopeType.APPLICATION) -public class CyclicBar -{ - - @In CyclicFoo cyclicFoo; - - @Factory(value = "cyclicFooBar", autoCreate = true) - public String provideCyclicFooBar() throws Exception - { - return cyclicFoo.getName() + "bar"; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicFoo.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicFoo.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/CyclicFoo.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,24 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -@Name("cyclicFoo") -(a)Scope(ScopeType.APPLICATION) -public class CyclicFoo -{ - @In String cyclicFooBar; //from CyclicBar#provideCyclicFooBar - - public String getName() throws Exception - { - return "foo"; - } - - public String getFooBar() throws Exception - { - return cyclicFooBar; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/DependencyTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/DependencyTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/DependencyTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,237 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.init.ComponentDescriptor; -import org.jboss.seam.init.DependencyManager; -import org.testng.Assert; -import org.testng.annotations.Test; - -public class DependencyTest { - @Test - public void testNoComponents() - { - Assert.assertEquals(0, installSet().size()); - } - - @Test - public void testNoDependencies() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - - Set<ComponentDescriptor> installed = installSet(desc1); - Assert.assertEquals(installed.size(), 1); - } - - - @Test - public void testNotInstalled() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setInstalled(false); - - Assert.assertEquals(installSet(desc1).size(), 0); - } - - - @Test - public void testOverride() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setPrecedence(Install.APPLICATION); - MockDescriptor desc2 = new MockDescriptor("foo", SomeClass.class); - desc2.setPrecedence(Install.DEPLOYMENT); - MockDescriptor desc3 = new MockDescriptor("foo", SomeClass.class); - desc3.setPrecedence(Install.BUILT_IN); - - Set<ComponentDescriptor> installed = installSet(desc1, desc2, desc3); - Assert.assertEquals(installed.size(), 1); - Assert.assertEquals(installed.iterator().next().getPrecedence(),Install.DEPLOYMENT); - } - - - @Test - public void testOverride2() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setDependencies(new String[] {"bar"}); - MockDescriptor desc2 = new MockDescriptor("bar", SomeClass.class); - desc2.setPrecedence(Install.FRAMEWORK); - MockDescriptor desc3 = new MockDescriptor("bar", SomeOtherClass.class); - desc3.setPrecedence(Install.APPLICATION); - desc3.setClassDependencies(new String[] {"SomeClassThatDoesntExist"}); - - - Set<ComponentDescriptor> installed = installSet(desc1, desc2, desc3); - Assert.assertEquals(installed.size(), 2); - Assert.assertTrue(installed.contains(desc1), "contains desc1"); - Assert.assertTrue(installed.contains(desc2), "contains desc2"); - - } - - @Test - public void testClassDependency() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setClassDependencies(new String[] {"SomeClassThatDoesntExist"}); - - Set<ComponentDescriptor> installed = installSet(desc1); - Assert.assertEquals(installed.size(), 0); - - desc1.setClassDependencies(new String[] {"SomeClassThatDoesntExist", SomeClass.class.getName()}); - installed = installSet(desc1); - Assert.assertEquals(installed.size(), 0); - - desc1.setClassDependencies(new String[] {SomeClass.class.getName()}); - installed = installSet(desc1); - Assert.assertEquals(installed.size(), 1); - } - - @Test - public void testDependency() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setDependencies(new String[] {"bar"}); - MockDescriptor desc2 = new MockDescriptor("bar", SomeClass.class); - desc2.setDependencies(new String[] {"baz"}); - MockDescriptor desc3 = new MockDescriptor("baz", SomeClass.class); - - Assert.assertEquals(installSet(desc1).size(), 0); - Assert.assertEquals(installSet(desc1,desc2).size(), 0); - Assert.assertEquals(installSet(desc1,desc2,desc3).size(), 3); - } - - @Test - public void testCircularDependency() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setDependencies(new String[] {"bar"}); - MockDescriptor desc2 = new MockDescriptor("bar", SomeClass.class); - desc2.setDependencies(new String[] {"foo"}); - - Assert.assertEquals(installSet(desc1).size(), 0); - Assert.assertEquals(installSet(desc2).size(), 0); - Assert.assertEquals(installSet(desc1,desc2).size(), 2); - - // just to make sure - desc1.setDependencies(new String[] {"foo"}); - Assert.assertEquals(installSet(desc1).size(), 1); - } - - - @Test - public void testComponentByClassDependency() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setGenericDependencies(new Class[] {SomeOtherClass.class}); - MockDescriptor desc2 = new MockDescriptor("bar", SomeOtherClass.class); - - Assert.assertEquals(installSet(desc1).size(), 0); - Assert.assertEquals(installSet(desc2).size(), 1); - Assert.assertEquals(installSet(desc1,desc2).size(), 2); - } - - - @Test - public void testUnmetDueToOverride() { - MockDescriptor desc1 = new MockDescriptor("foo", SomeClass.class); - desc1.setGenericDependencies(new Class[] {SomeOtherClass.class}); - MockDescriptor desc2 = new MockDescriptor("bar", SomeOtherClass.class); - desc2.setPrecedence(Install.FRAMEWORK); - MockDescriptor desc3 = new MockDescriptor("bar", SomeUnrelatedClass.class); - - Set<ComponentDescriptor> installed = installSet(desc1,desc2); - Assert.assertEquals(installed.size(), 2); - - installed = installSet(desc1,desc2,desc3); - Assert.assertEquals(installed.size(), 1); - Assert.assertEquals(installed.iterator().next().getName(), "bar"); - Assert.assertEquals(installed.iterator().next().getPrecedence(), Install.APPLICATION); - } - // ------------------------------------------------------ - - - private Map<String,Set<ComponentDescriptor>> componentSet(ComponentDescriptor... descriptors) { - Map<String,Set<ComponentDescriptor>> map = new HashMap<String, Set<ComponentDescriptor>>(); - - for (ComponentDescriptor descriptor: descriptors) { - addDependency(map, descriptor); - } - return map; - } - - private Set<ComponentDescriptor> installSet(ComponentDescriptor... descriptors) { - DependencyManager manager = new DependencyManager(componentSet(descriptors)); - return manager.installedSet(); - } - - private void addDependency(Map<String,Set<ComponentDescriptor>> dependencies, - ComponentDescriptor descriptor) - { - Set<ComponentDescriptor> descriptors = dependencies.get(descriptor.getName()); - if (descriptors == null) - { - descriptors = new TreeSet<ComponentDescriptor>(new ComponentDescriptor.PrecedenceComparator()); - dependencies.put(descriptor.getName(), descriptors); - } - - descriptors.add(descriptor); - } - - static class MockDescriptor - extends ComponentDescriptor - { - private String[] classDependencies; - private String[] dependencies; - private Class[] genericDependencies; - - public MockDescriptor(String name, Class<?> componentClass) { - super(name, componentClass, ScopeType.SESSION); - } - - public void setInstalled(boolean installed) { - this.installed = installed; - } - - public void setPrecedence(int precedence) { - this.precedence = precedence; - } - - public void setClassDependencies(String[] classDependencies) { - this.classDependencies = classDependencies; - } - - @Override - public String[] getClassDependencies() { - return (classDependencies != null) ? - classDependencies : super.getClassDependencies(); - } - - public void setDependencies(String[] dependencies) { - this.dependencies = dependencies; - } - - @Override - public String[] getDependencies() { - return (dependencies != null) ? - dependencies : super.getDependencies(); - } - - public void setGenericDependencies(Class[] genericDependencies) { - this.genericDependencies = genericDependencies; - } - - @Override - public Class[] getGenericDependencies() { - return (genericDependencies != null) ? - genericDependencies : super.getGenericDependencies(); - } - } - - - static class SomeClass { - } - - static class SomeOtherClass { - } - - static class SomeUnrelatedClass { - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Ejb.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Ejb.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Ejb.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,11 +0,0 @@ -//$Id: Ejb.java 6435 2007-10-08 18:15:49Z pmuir $ -package org.jboss.seam.test.unit; - -import javax.ejb.Local; - -@Local -public interface Ejb -{ - public void foo(); - public void destroy(); -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/EjbBean.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/EjbBean.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/EjbBean.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,22 +0,0 @@ -//$Id: EjbBean.java 6435 2007-10-08 18:15:49Z pmuir $ -package org.jboss.seam.test.unit; - -import javax.ejb.Remove; -import javax.ejb.Stateful; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.JndiName; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -@Stateful -@Name("ejb") -(a)Scope(ScopeType.EVENT) -@JndiName("x") -public class EjbBean implements Ejb -{ - public void foo() {} - @Remove @Destroy - public void destroy() {} -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ExpressionsTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ExpressionsTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/ExpressionsTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,132 +0,0 @@ -package org.jboss.seam.test.unit; - -import static org.testng.Assert.assertEquals; - -import java.beans.FeatureDescriptor; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.PropertyNotFoundException; -import javax.faces.application.Application; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.event.PhaseId; - -import org.jboss.seam.contexts.FacesLifecycle; -import org.jboss.seam.core.Expressions; -import org.jboss.seam.faces.FacesExpressions; -import org.jboss.seam.mock.MockApplication; -import org.jboss.seam.mock.MockExternalContext; -import org.jboss.seam.mock.MockFacesContext; -import org.jboss.seam.mock.MockHttpServletRequest; -import org.jboss.seam.mock.MockHttpSession; -import org.testng.annotations.Test; - -public class ExpressionsTest -{ - /** - * Validate that FacesExpressions reports that the FacesContext is activate and - * returns the Faces-aware EL context so that a Faces-specific expression can - * be resolved through Seam's built-in expression resolver. - * @jira JBSEAM-3674 - */ - @Test - public void testExpressionResolvedInFacesELContext() - { - Map<String, String> params = new HashMap<String, String>(); - params.put("foo", "bar"); - FacesContext facesContext = setupFacesContextToAccessRequestParams(params); - String expr = "#{param.foo}"; - - // the control - assertEquals(facesContext.getApplication().evaluateExpressionGet(facesContext, expr, Object.class), "bar"); - - // the test - FacesLifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION); - Expressions expressions = new FacesExpressions(); - assert expressions.getELContext().getContext(FacesContext.class) != null; - assertEquals(expressions.createValueExpression(expr).getValue(), "bar"); - } - - protected FacesContext setupFacesContextToAccessRequestParams(Map<String, String> params) - { - MockHttpServletRequest request = new MockHttpServletRequest(new MockHttpSession()); - if (params != null) - { - for (Map.Entry<String, String> param : params.entrySet()) - { - request.getParameterMap().put(param.getKey(), new String[] { param.getValue() }); - } - } - ExternalContext extContext = new MockExternalContext(request); - Application application = new MockApplication(); - application.addELResolver(new ImplicitObjectELResolver()); - FacesContext facesCtx = new MockFacesContext(extContext, application).setCurrent(); - assert FacesContext.getCurrentInstance() != null; - return facesCtx; - } - - /** - * This resolver resolves select implicit objects that are available to the EL during a Faces request. - * It must be implemented here since it is part of the JSF RI, not the API. - */ - class ImplicitObjectELResolver extends ELResolver - { - private final String PARAM = "param"; - - private final String[] IMPLICIT_OBJECT_NAMES = new String[] { PARAM }; - - @Override - public Class<?> getCommonPropertyType(ELContext ctx, Object base) - { - return null; - } - - @Override - public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext ctx, Object base) - { - return null; - } - - @Override - public Class<?> getType(ELContext ctx, Object base, Object prop) - { - return null; - } - - @Override - public Object getValue(ELContext elCtx, Object base, Object prop) - { - if (base != null) return null; - - if (prop == null) throw new PropertyNotFoundException("No such property " + prop); - - int idx = Arrays.binarySearch(IMPLICIT_OBJECT_NAMES, prop); - if (idx < 0) return null; - - FacesContext facesCtx = (FacesContext) elCtx.getContext(FacesContext.class); - ExternalContext extCtx = facesCtx.getExternalContext(); - - if (prop.equals(PARAM)) - { - elCtx.setPropertyResolved(true); - return extCtx.getRequestParameterMap(); - } - - throw new IllegalStateException("Programming error: list of possible conditions is incomplete"); - } - - @Override - public boolean isReadOnly(ELContext ctx, Object base, Object prop) - { - return true; - } - - @Override - public void setValue(ELContext ctx, Object base, Object prop, Object value) {} - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Factory.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Factory.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Factory.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,18 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; - -@Name("factory") -public class Factory -{ - @Out(scope=ScopeType.CONVERSATION, required=true) - String name; - - @org.jboss.seam.annotations.Factory("name") - public void createName() - { - name="Gavin King"; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Foo.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Foo.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Foo.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ -package org.jboss.seam.test.unit; - -import java.io.Serializable; - -import javax.ejb.Remove; -import javax.validation.constraints.NotNull; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute </a> - * @version $Revision: 8990 $ - */ -@Name("foo") -(a)Scope(ScopeType.SESSION) -public class Foo implements Serializable -{ - private static final long serialVersionUID = -5448030633067107049L; - - private String value; - - public String foo() { return "foo"; } - - @Remove - public void destroy() {} - - @NotNull - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } - - public String bar() - { - return "bar"; - } - - @Begin - public String begin() - { - return "begun"; - } - @End - public String end() - { - return "ended"; - } - - @Begin - public String beginNull() - { - return null; - } - @End - public String endNull() - { - return null; - } - - @Begin(nested=true) - public String beginNested() - { - return "begunNested"; - } - @End(root=true) - public String endRoot() - { - return "endedRoot"; - } - - @Begin - public void beginVoid() { } - @End - public void endVoid() { } - - @Begin(ifOutcome="success") - public String beginIf() - { - return "success"; - } - @End(ifOutcome="success") - public String endIf() - { - return "success"; - } - -} - - Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/FooBar.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/FooBar.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/FooBar.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,22 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -@Name("fooBar") -(a)Scope(ScopeType.APPLICATION) -public class FooBar -{ - @In Foo foo; - - public Foo delayedGetFoo(InvocationControl invocationControl) - { - //System.out.println("enter: " + invocationControl.getName() + " " + foo); - invocationControl.init(); - invocationControl.markStarted(); - //System.out.println("exit: " + invocationControl.getName() + " " + foo); - return foo; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/HomeTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/HomeTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/HomeTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,180 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.lang.reflect.Field; -import java.util.List; - -import javax.persistence.EntityManager; - -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.framework.EntityHome; -import org.jboss.seam.framework.HibernateEntityHome; -import org.jboss.seam.framework.Home; -import org.jboss.seam.international.StatusMessage; -import org.jboss.seam.international.StatusMessages; -import org.jboss.seam.test.unit.entity.SimpleEntity; -import org.jboss.seam.util.Reflections; -import org.testng.annotations.Test; - -public class HomeTest -{ - /** - * The only condition under which the getEntityClass() should be able to - * resolve the entity correctly is if the entityClass is provided or the Home - * implementation extends either EntityHome or HibernateEntityHome and - * provides a type parameter in the class definition - */ - @Test - public void testReadEntityClassFromTypeParameter() - { - EntityHome typelessHome = new EntityHome(); - typelessHome.setEntityClass(SimpleEntity.class); - assert typelessHome.getEntityClass() == SimpleEntity.class; - - assert new SimpleEntityHomeWithType().getEntityClass() == SimpleEntity.class; - - try - { - Class ec = new SimpleEntityHomeSansType().getEntityClass(); - assert false : "Not expecting to have resolved a type, but got " + ec; - } - catch (IllegalArgumentException e) - { - } - - try - { - Class ec = new EntityHome<SimpleEntity>().getEntityClass(); - assert false : "Not expecting to have resolved a type, but got " + ec; - } - catch (IllegalArgumentException e) - { - } - - assert new SimpleHibernateEntityHomeWithType().getEntityClass() == SimpleEntity.class; - - try - { - Class ec = new SimpleHibernateEntityHomeSansType().getEntityClass(); - assert false : "Not expecting to have resolved a type, but got " + ec; - } - catch (IllegalArgumentException e) - { - } - - try - { - Class ec = new HibernateEntityHome<SimpleEntity>().getEntityClass(); - assert false : "Not expecting to have resolved a type, but got " + ec; - } - catch (IllegalArgumentException e) - { - } - - assert new Home<EntityManager, SimpleEntity>() - { - - @Override - protected String getEntityName() - { - return "SimpleEntity"; - } - - @Override - protected String getPersistenceContextName() - { - return "entityManager"; - } - - }.getEntityClass() == SimpleEntity.class; - } - - /** - * Ensure that the add message methods do not trigger a null pointer - * exception if the getEntityClass() method is overridden. - */ - @Test - public void testGetEntityClassOverride() { - SimpleEntityHomeWithMessageStubs home = new SimpleEntityHomeWithMessageStubs(); - // emulate @Create method - home.create(); - home.triggerCreatedMessage(); - List<StatusMessage> registeredMessages = home.getRegisteredMessages(); - assert registeredMessages.size() == 1; - } - - /** - * Ensure that an instance can be created when getEntityClass() - * method is overridden. - */ - @Test - public void testCreateInstance() { - SimpleEntityHomeWithMessageStubs home = new SimpleEntityHomeWithMessageStubs(); - // emulate @Create method - home.create(); - SimpleEntity entity = home.getInstance(); - assert entity != null : "Excepting a non-null instance"; - assert entity.getClass().equals(SimpleEntity.class) : "Expecting entity class to be " + SimpleEntity.class + " but got " + entity.getClass(); - } - - public class SimpleEntityHomeSansType extends EntityHome {} - - public class SimpleEntityHomeWithType extends EntityHome<SimpleEntity> {} - - public class SimpleHibernateEntityHomeSansType extends HibernateEntityHome {} - - public class SimpleHibernateEntityHomeWithType extends HibernateEntityHome<SimpleEntity> {} - - public class SimpleEntityHomeWithMessageStubs extends Home<EntityManager, SimpleEntity> { - - private StatusMessages statusMessages; - - public SimpleEntityHomeWithMessageStubs() { - statusMessages = new FacesMessages(); - } - - public void triggerCreatedMessage() { - createdMessage(); - } - - @Override - protected void debug(Object object, Object... params) - { - // ignore - } - - @Override - protected StatusMessages getStatusMessages() - { - return statusMessages; - } - - protected List<StatusMessage> getRegisteredMessages() - { - Field field = Reflections.getField(statusMessages.getClass(), "messages"); - if (!field.isAccessible()) - { - field.setAccessible(true); - } - return (List<StatusMessage>) Reflections.getAndWrap(field, statusMessages); - } - - @Override - public Class<SimpleEntity> getEntityClass() - { - return SimpleEntity.class; - } - - @Override - protected String getEntityName() - { - return "SimpleEntity"; - } - - @Override - protected String getPersistenceContextName() - { - return "entityManager"; - } - - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InitializationTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InitializationTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InitializationTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,76 +0,0 @@ -//$Id: InitializationTest.java 9122 2008-09-23 15:47:57Z dan.j.allen $ -package org.jboss.seam.test.unit; - -import org.jboss.seam.Component; -import org.jboss.seam.Seam; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.Lifecycle; -import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.core.Manager; -import org.jboss.seam.init.Initialization; -import org.jboss.seam.mock.MockServletContext; -import org.jboss.seam.test.unit.component.ConfigurableComponent; -import org.jboss.seam.test.unit.component.MyEntityHome; -import org.jboss.seam.test.unit.component.PrimaryColor; -import org.jboss.seam.transaction.NoTransaction; -import org.jboss.seam.transaction.Transaction; -import org.testng.Assert; -import org.testng.annotations.Test; - -public class InitializationTest -{ - @Test - public void testInitialization() - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - new Initialization(servletContext).create().init(); - - assert !servletContext.getAttributes().isEmpty(); - assert servletContext.getAttributes().containsKey( Seam.getComponentName(Manager.class) + ".component" ); - assert servletContext.getAttributes().containsKey( Seam.getComponentName(Foo.class) + ".component" ); - assert !Contexts.isApplicationContextActive(); - ServletLifecycle.endApplication(); - } - - /** - * Configuration for ConfigurableComponent is defined in ConfigurableComponent.component.xml - */ - @Test - public void testEnumPropertyAssignment() - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - new Initialization( servletContext ).create().init(); - - Lifecycle.beginCall(); - - ConfigurableComponent component = (ConfigurableComponent) Component.getInstance(ConfigurableComponent.class); - assert component != null; - assert component.getPrimaryColor().equals(PrimaryColor.RED); - - ServletLifecycle.endApplication(); - } - - @Test - public void testEntityHomeConfiguration() - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - new Initialization( servletContext ).create().init(); - Lifecycle.beginCall(); - Contexts.getEventContext().set(Seam.getComponentName(Transaction.class), new NoTransaction()); - MyEntityHome myEntityHome = (MyEntityHome) Component.getInstance("myEntityHome"); - assert myEntityHome != null; - // verify that the reference to new-instance remains unparsed - Assert.assertEquals(myEntityHome.getNewInstance().getExpressionString(), "#{simpleEntity}"); - // verify that the message string for the created/updated/deleted message remains unparsed - Assert.assertEquals(myEntityHome.getCreatedMessage().getExpressionString(), "You #{'created'} it! Yeah!"); - // verify that the id is parsed prior to assignment - Assert.assertEquals(String.valueOf(myEntityHome.getId()), "11"); - - ServletLifecycle.endApplication(); - } - //TODO: write a test for components.xml -} - Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterceptorTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterceptorTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterceptorTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,1113 +0,0 @@ -//$Id: InterceptorTest.java 9561 2008-11-14 03:26:13Z dan.j.allen $ -package org.jboss.seam.test.unit; - -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -import javax.faces.context.ExternalContext; -import javax.faces.event.PhaseId; - -import org.jboss.seam.Component; -import org.jboss.seam.CyclicDependencyException; -import org.jboss.seam.NoConversationException; -import org.jboss.seam.RequiredException; -import org.jboss.seam.Seam; -import org.jboss.seam.contexts.ApplicationContext; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.FacesLifecycle; -import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.core.BijectionInterceptor; -import org.jboss.seam.core.ConversationEntries; -import org.jboss.seam.core.ConversationInterceptor; -import org.jboss.seam.core.ConversationalInterceptor; -import org.jboss.seam.core.Events; -import org.jboss.seam.core.Init; -import org.jboss.seam.core.Interpolator; -import org.jboss.seam.core.Manager; -import org.jboss.seam.ejb.RemoveInterceptor; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.intercept.InvocationContext; -import org.jboss.seam.mock.MockApplication; -import org.jboss.seam.mock.MockExternalContext; -import org.jboss.seam.mock.MockFacesContext; -import org.jboss.seam.mock.MockServletContext; -import org.jboss.seam.persistence.PersistenceContexts; -import org.jboss.seam.util.Reflections; -import org.testng.Assert; -import org.testng.annotations.Test; - -public class InterceptorTest -{ - - @Test - public void testBijectionInterceptor() throws Exception - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockExternalContext externalContext = new MockExternalContext(servletContext); - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - appContext.set( Seam.getComponentName(Init.class), new Init() ); - appContext.set( - Seam.getComponentName(ConversationEntries.class) + ".component", - new Component(ConversationEntries.class, appContext) - ); - appContext.set( - Seam.getComponentName(Manager.class) + ".component", - new Component(Manager.class, appContext) - ); - appContext.set( - Seam.getComponentName(Foo.class) + ".component", - new Component(Foo.class, appContext) - ); - appContext.set( - Seam.getComponentName(Factory.class) + ".component", - new Component(Factory.class, appContext) - ); - - FacesLifecycle.beginRequest(externalContext); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE); - - final Bar bar = new Bar(); - final Foo foo = new Foo(); - Contexts.getSessionContext().set("otherFoo", foo); - - BijectionInterceptor bi = new BijectionInterceptor(); - bi.setComponent( new Component(Bar.class, appContext) ); - String result = (String) bi.aroundInvoke( new MockInvocationContext() { - @Override - public Object getTarget() - { - return bar; - } - - @Override - public Object proceed() throws Exception - { - assert bar.otherFoo==foo; - assert bar.foo!=null; - return bar.foo(); - } - }); - assert "foo".equals(result); - assert Contexts.getEventContext().get("otherString").equals("outAgain"); - assert Contexts.getConversationContext().get("string").equals("out"); - assert Contexts.getSessionContext().isSet("foo"); - assert bar.foo==null; - assert bar.otherFoo==null; - - final Method method; - try - { - method = Bar.class.getMethod("foo"); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - - bi.aroundInvoke( new MockInvocationContext() { - @Override - public Object getTarget() - { - return bar; - } - - @Override - public Object proceed() throws Exception - { - assert bar.otherFoo==foo; - assert bar.foo!=null; - return bar.foo(); - } - @Override - public Method getMethod() - { - return method; - } - }); - assert bar.foo==null; - assert bar.otherFoo==null; - - try - { - Contexts.getSessionContext().remove("otherFoo"); - bi.aroundInvoke( new MockInvocationContext() { - @Override - public Object getTarget() - { - return bar; - } - @Override - public Object proceed() throws Exception - { - assert false; - return null; - } - @Override - public Method getMethod() - { - return method; - } - }); - assert false; - } - catch (Exception e) - { - assert e instanceof RequiredException; - } - - final Method method2; - try - { - method2 = BrokenAction.class.getMethod("go"); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - - final BrokenAction brokenAction = new BrokenAction(); - BijectionInterceptor biba = new BijectionInterceptor(); - biba.setComponent( new Component(BrokenAction.class, appContext) ); - try - { - biba.aroundInvoke( new MockInvocationContext() { - - @Override - public Object getTarget() { - return brokenAction; - } - @Override - public Object proceed() throws Exception { - assert false; - return null; - } - - @Override - public Method getMethod() - { - return method2; - } - - } ); - assert false; - } - catch (Exception e) - { - assert e instanceof RequiredException; - } - - final Method method3; - try - { - method3 = Action.class.getMethod("go"); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - - final Action action = new Action(); - BijectionInterceptor bia = new BijectionInterceptor(); - bia.setComponent( new Component(Action.class, appContext) ); - result = (String) bia.aroundInvoke( new MockInvocationContext() { - - @Override - public Object getTarget() { - return action; - } - - @Override - public Object proceed() throws Exception { - assert "Gavin King".equals(action.name); - return action.go(); - } - - @Override - public Method getMethod() - { - return method3; - } - - } ); - assert "success".equals(result); - assert Contexts.getConversationContext().get("name").equals("Gavin King"); - - ServletLifecycle.endApplication(); - } - - /** - * A hack for returning an exception from a thread - * - */ - private class WrappedException { - Exception exception; - } - - /** - * This test uses two threads to concurrently invoke the same method on the same component. It uses - * latches to control the progress of each thread to ensure that the bijection interceptor is - * correctly injecting/disinjecting the component at the right times. - * - * @throws Exception - */ - @Test - public void testReentrantBijection() throws Exception - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - final MockExternalContext externalContext = new MockExternalContext(servletContext); - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - appContext.set( Seam.getComponentName(Init.class), new Init() ); - appContext.set( Seam.getComponentName(ConversationEntries.class) + ".component", - new Component(ConversationEntries.class, appContext) ); - appContext.set( Seam.getComponentName(Manager.class) + ".component", - new Component(Manager.class, appContext) ); - appContext.set( Seam.getComponentName(Foo.class) + ".component", - new Component(Foo.class, appContext) ); - appContext.set( Seam.getComponentName(FooBar.class) + ".component", - new Component(FooBar.class, appContext) ); - - final Foo foo = new Foo(); - final FooBar fooBar = new FooBar(); - - final BijectionInterceptor bi = new BijectionInterceptor(); - bi.setComponent( new Component(FooBar.class, appContext) ); - - final Method m = FooBar.class.getMethod("delayedGetFoo", InvocationControl.class); - - final InvocationControl invocationAControl = new InvocationControl("A"); - final InvocationControl invocationBControl = new InvocationControl("B"); - final InvocationControl invocationCControl = new InvocationControl("C"); - - final Map<String, Foo> invocationResults = new HashMap<String, Foo>(); - - final InvocationContext invocationA = new MockInvocationContext() { - @Override public Object getTarget() { return fooBar; } - @Override public Method getMethod() { return m; } - @Override public Object[] getParameters() { return new Object[] { invocationAControl }; } - @Override public Object proceed() throws Exception { return Reflections.invoke(getMethod(), getTarget(), getParameters()); } - }; - - final InvocationContext invocationB = new MockInvocationContext() { - @Override public Object getTarget() { return fooBar; } - @Override public Method getMethod() { return m; } - @Override public Object[] getParameters() { return new Object[] { invocationBControl }; } - @Override public Object proceed() throws Exception { return Reflections.invoke(getMethod(), getTarget(), getParameters()); } - }; - - final InvocationContext invocationC = new MockInvocationContext() { - @Override public Object getTarget() { return fooBar; } - @Override public Method getMethod() { return m; } - @Override public Object[] getParameters() { return new Object[] { invocationCControl }; } - @Override public Object proceed() throws Exception { return Reflections.invoke(getMethod(), getTarget(), getParameters()); } - }; - - final WrappedException thread1Exception = new WrappedException(); - final WrappedException thread2Exception = new WrappedException(); - final WrappedException thread3Exception = new WrappedException(); - - new Thread(new Runnable() { - public void run() { - try - { - FacesLifecycle.beginRequest(externalContext); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE); - - Contexts.getSessionContext().set("foo", foo); - Foo result = (Foo) bi.aroundInvoke( invocationA ); - invocationResults.put("A", result); - } - catch (Exception ex) - { - thread1Exception.exception = ex; - } - finally - { - invocationAControl.markFinished(); - } - } - }).start(); - - new Thread(new Runnable() { - public void run() { - try - { - FacesLifecycle.beginRequest(externalContext); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE); - - Contexts.getSessionContext().set("foo", foo); - - Foo result = (Foo) bi.aroundInvoke( invocationB ); - invocationResults.put("B", result); - } - catch (Exception ex) - { - thread2Exception.exception = ex; - } - finally - { - invocationBControl.markFinished(); - } - } - }).start(); - - new Thread(new Runnable() { - public void run() { - try - { - FacesLifecycle.beginRequest(externalContext); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE); - - Contexts.getSessionContext().set("foo", foo); - - Foo result = (Foo) bi.aroundInvoke( invocationC ); - invocationResults.put("C", result); - } - catch (Exception ex) - { - thread3Exception.exception = ex; - } - finally - { - invocationCControl.markFinished(); - } - } - }).start(); - - invocationAControl.start(); - invocationBControl.start(); - invocationCControl.start(); - - invocationAControl.finish(); - invocationBControl.finish(); - invocationCControl.finish(); - - if (thread1Exception.exception != null) throw thread1Exception.exception; - if (thread2Exception.exception != null) throw thread2Exception.exception; - if (thread3Exception.exception != null) throw thread3Exception.exception; - - Assert.assertEquals(invocationResults.get("A"), foo, "Injected value not accurate at end of method invocation A."); - Assert.assertEquals(invocationResults.get("B"), foo, "Injected value not accurate at end of method invocation B."); - Assert.assertEquals(invocationResults.get("C"), foo, "Injected value not accurate at end of method invocation C."); - } - - @Test - public void testCyclicDependencyThowsException() throws Exception - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockExternalContext externalContext = new MockExternalContext(servletContext); - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - appContext.set( Seam.getComponentName(Init.class), new Init() ); - appContext.set( - Seam.getComponentName(ConversationEntries.class) + ".component", - new Component(ConversationEntries.class, appContext) - ); - appContext.set( - Seam.getComponentName(Manager.class) + ".component", - new Component(Manager.class, appContext) - ); - appContext.set( - Seam.getComponentName(CyclicFoo.class) + ".component", - new Component(CyclicFoo.class, appContext) - ); - appContext.set( - Seam.getComponentName(CyclicBar.class) + ".component", - new Component(CyclicBar.class, appContext) - ); - - FacesLifecycle.beginRequest(externalContext); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE); - - final CyclicFoo cyclicFoo = new CyclicFoo(); - final CyclicBar cyclicBar = new CyclicBar(); - - final BijectionInterceptor cyclicFooBijectionInterceptor = new BijectionInterceptor(); - cyclicFooBijectionInterceptor.setComponent( new Component(CyclicFoo.class, appContext) ); - final Method cyclicFooGetName = CyclicFoo.class.getMethod("getName"); - final MockInvocationContext callGetName = new MockInvocationContext() { - @Override - public Object getTarget() - { - return cyclicFoo; - } - - @Override - public Object proceed() throws Exception - { - return cyclicFoo.getName(); - } - - @Override - public Method getMethod() - { - return cyclicFooGetName; - } - }; - - final Method cyclicFooGetFooBar = CyclicFoo.class.getMethod("getFooBar"); - final MockInvocationContext callGetCyclicFooBar = new MockInvocationContext() { - @Override - public Object getTarget() - { - return cyclicFoo; - } - - @Override - public Object proceed() throws Exception - { - return cyclicFoo.getFooBar(); - } - - @Override - public Method getMethod() - { - return cyclicFooGetFooBar; - } - }; - - CyclicFoo cyclicFooProxy = new CyclicFoo() - { - @Override - public String getName() throws Exception - { - return (String) cyclicFooBijectionInterceptor.aroundInvoke(callGetName); - } - - @Override - public String getFooBar() throws Exception - { - return (String) cyclicFooBijectionInterceptor.aroundInvoke(callGetCyclicFooBar); - } - }; - - - final BijectionInterceptor cyclicBarBijectionInterceptor = new BijectionInterceptor(); - cyclicBarBijectionInterceptor.setComponent( new Component(CyclicBar.class, appContext) ); - final Method cyclicBarProvideCyclicFooBar = CyclicBar.class.getMethod("provideCyclicFooBar"); - final MockInvocationContext callProvideCyclicFooBar = new MockInvocationContext() { - @Override - public Object getTarget() - { - return cyclicBar; - } - - @Override - public Object proceed() throws Exception - { - return cyclicBar.provideCyclicFooBar(); - } - - @Override - public Method getMethod() - { - return cyclicBarProvideCyclicFooBar; - } - }; - - final CyclicBar cyclicBarProxy = new CyclicBarProxy(callProvideCyclicFooBar, cyclicBarBijectionInterceptor); - - - appContext.set("cyclicFoo", cyclicFooProxy); - appContext.set("cyclicBar", cyclicBarProxy); - - try - { - cyclicFooProxy.getFooBar(); - assert false : "cyclic dependency not detected"; - } - catch (CyclicDependencyException e) {} - - } - - /* - * Needs to be non-anonymous, so that provideCyclicFooBar() can be accessed reflectively - */ - public class CyclicBarProxy extends CyclicBar - { - private final MockInvocationContext callProvideCyclicFooBar; - private final BijectionInterceptor cyclicBarBijectionInterceptor; - - private CyclicBarProxy(MockInvocationContext callProvideCyclicFooBar, BijectionInterceptor cyclicBarBijectionInterceptor) - { - this.callProvideCyclicFooBar = callProvideCyclicFooBar; - this.cyclicBarBijectionInterceptor = cyclicBarBijectionInterceptor; - } - - @Override - public String provideCyclicFooBar() throws Exception - { - return (String) cyclicBarBijectionInterceptor.aroundInvoke(callProvideCyclicFooBar); - } - } - - @Test - public void testConversationInterceptor() throws Exception - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockExternalContext externalContext = new MockExternalContext(servletContext); - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - appContext.set( Seam.getComponentName(Init.class), new Init() ); - appContext.set( - Seam.getComponentName(ConversationEntries.class) + ".component", - new Component(ConversationEntries.class, appContext) - ); - appContext.set( - Seam.getComponentName(PersistenceContexts.class) + ".component", - new Component(PersistenceContexts.class, appContext) - ); - appContext.set( - Seam.getComponentName(Manager.class) + ".component", - new Component(Manager.class, appContext) - ); - FacesLifecycle.beginRequest( externalContext ); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - - ConversationInterceptor ci = new ConversationInterceptor(); - ci.setComponent( new Component(Foo.class, appContext) ); - - assert !Manager.instance().isLongRunningConversation(); - - String result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("foo"); - } - @Override - public Object proceed() throws Exception - { - return "foo"; - } - }); - - assert !Manager.instance().isLongRunningConversation(); - assert "foo".equals(result); - - Manager.instance().initializeTemporaryConversation(); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("begin"); - } - @Override - public Object proceed() throws Exception - { - return "begun"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "begun".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("foo"); - } - @Override - public Object proceed() throws Exception - { - return "foo"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "foo".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("end"); - } - @Override - public Object proceed() throws Exception - { - return "ended"; - } - }); - - assert !Manager.instance().isLongRunningConversation(); - assert "ended".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("beginNull"); - } - @Override - public Object proceed() throws Exception - { - return null; - } - }); - - assert !Manager.instance().isLongRunningConversation(); - assert result==null; - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("beginVoid"); - } - @Override - public Object proceed() throws Exception - { - return null; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert result==null; - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("foo"); - } - @Override - public Object proceed() throws Exception - { - return "foo"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "foo".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("endNull"); - } - @Override - public Object proceed() throws Exception - { - return null; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert result==null; - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("endVoid"); - } - @Override - public Object proceed() throws Exception - { - return null; - } - }); - - assert !Manager.instance().isLongRunningConversation(); - assert result==null; - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("beginIf"); - } - @Override - public Object proceed() throws Exception - { - return "failure"; - } - }); - - assert !Manager.instance().isLongRunningConversation(); - assert "failure".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("beginIf"); - } - @Override - public Object proceed() throws Exception - { - return "success"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "success".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("foo"); - } - @Override - public Object proceed() throws Exception - { - return "foo"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "foo".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("endIf"); - } - @Override - public Object proceed() throws Exception - { - return "failure"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "failure".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("endIf"); - } - @Override - public Object proceed() throws Exception - { - return "success"; - } - }); - - assert !Manager.instance().isLongRunningConversation(); - assert "success".equals(result); - - /////////////////////////////////////////////// - // Test @End(root=true) for nested conversation - /////////////////////////////////////////////// - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("begin"); - } - @Override - public Object proceed() throws Exception - { - return "begun"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "begun".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("beginNested"); - } - @Override - public Object proceed() throws Exception - { - return "begunNested"; - } - }); - - assert Manager.instance().isNestedConversation(); - assert "begunNested".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("endRoot"); - } - @Override - public Object proceed() throws Exception - { - return "endedRoot"; - } - }); - - assert !Manager.instance().isNestedConversation(); - assert !Manager.instance().isLongRunningConversation(); - assert "endedRoot".equals(result); - - ///////////////////////////////////////////////////// - // Test @End(root=true) for a non-nested conversation - ///////////////////////////////////////////////////// - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("begin"); - } - @Override - public Object proceed() throws Exception - { - return "begun"; - } - }); - - assert Manager.instance().isLongRunningConversation(); - assert "begun".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("endRoot"); - } - @Override - public Object proceed() throws Exception - { - return "endedRoot"; - } - }); - - assert !Manager.instance().isNestedConversation(); - assert !Manager.instance().isLongRunningConversation(); - assert "endedRoot".equals(result); - } - - @Test - public void testConversationalInterceptor() throws Exception - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockExternalContext externalContext = new MockExternalContext(servletContext); - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - appContext.set( Seam.getComponentName(Init.class), new Init() ); - appContext.set( - Seam.getComponentName(ConversationEntries.class) + ".component", - new Component(ConversationEntries.class, appContext) - ); - appContext.set( - Seam.getComponentName(Manager.class) + ".component", - new Component(Manager.class, appContext) - ); - appContext.set( - Seam.getComponentName(FacesMessages.class) + ".component", - new Component(FacesMessages.class, appContext) - ); - appContext.set( - Seam.getComponentName(Events.class) + ".component", - new Component(Events.class, appContext) - ); - FacesLifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION); - FacesLifecycle.beginRequest( externalContext ); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - - ConversationalInterceptor ci = new ConversationalInterceptor(); - ci.setComponent( new Component(Bar.class, appContext) ); - - assert !Manager.instance().isLongRunningConversation(); - - try - { - - ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("foo"); - } - @Override - public Object proceed() throws Exception - { - assert false; - return null; - } - }); - - assert false; - - } - catch (Exception e) - { - assert e instanceof NoConversationException; - } - - assert !Manager.instance().isLongRunningConversation(); - - String result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("begin"); - } - @Override - public Object proceed() throws Exception - { - return "begun"; - } - }); - - Manager.instance().initializeTemporaryConversation(); - Manager.instance().beginConversation(); - - //assert Manager.instance().isLongRunningConversation(); - assert "begun".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("foo"); - } - @Override - public Object proceed() throws Exception - { - return "foo"; - } - }); - - //assert Manager.instance().isLongRunningConversation(); - assert "foo".equals(result); - - result = (String) ci.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("end"); - } - @Override - public Object proceed() throws Exception - { - return "ended"; - } - }); - - Manager.instance().endConversation(false); - - //assert !Manager.instance().isLongRunningConversation(); - assert "ended".equals(result); - - ServletLifecycle.endApplication(); - - } - - @Test - public void testValidationInterceptor() throws Exception - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - ExternalContext externalContext = new MockExternalContext(servletContext); - new MockFacesContext( externalContext, new MockApplication() ).setCurrent().createViewRoot(); - - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - appContext.set( Seam.getComponentName(Init.class), new Init() ); - appContext.set( - Seam.getComponentName(ConversationEntries.class) + ".component", - new Component(ConversationEntries.class, appContext) - ); - appContext.set( - Seam.getComponentName(Manager.class) + ".component", - new Component(Manager.class, appContext) - ); - appContext.set( - Seam.getComponentName(FacesMessages.class) + ".component", - new Component(FacesMessages.class, appContext) - ); - appContext.set( - Seam.getComponentName(Interpolator.class) + ".component", - new Component(Interpolator.class, appContext) - ); - FacesLifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION); - FacesLifecycle.beginRequest(externalContext); - Manager.instance().setCurrentConversationId("1"); - FacesLifecycle.resumeConversation(externalContext); - - ServletLifecycle.endApplication(); - } - - @Test - public void testRemoveInterceptor() throws Exception - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockExternalContext externalContext = new MockExternalContext(servletContext); - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - appContext.set( Seam.getComponentName(Init.class), new Init() ); - appContext.set( - Seam.getComponentName(ConversationEntries.class) + ".component", - new Component(ConversationEntries.class, appContext) - ); - appContext.set( - Seam.getComponentName(Manager.class) + ".component", - new Component(Manager.class, appContext) - ); - - FacesLifecycle.beginRequest( externalContext ); - Contexts.getSessionContext().set( "foo", new Foo() ); - - RemoveInterceptor ri = new RemoveInterceptor(); - ri.setComponent( new Component(Foo.class, appContext) ); - - ri.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("foo"); - } - } ); - - assert Contexts.getSessionContext().isSet("foo"); - - ri.aroundInvoke( new MockInvocationContext() { - @Override - public Method getMethod() - { - return InterceptorTest.getMethod("destroy"); - } - } ); - - assert !Contexts.getSessionContext().isSet("foo"); - - ServletLifecycle.endApplication(); - } - - static Method getMethod(String name) - { - try - { - return Foo.class.getMethod(name); - } - catch (Exception e) - { - assert false; - return null; - } - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterpolatorTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterpolatorTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InterpolatorTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,67 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.text.DateFormat; -import java.util.Date; - -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.Expressions; -import org.jboss.seam.core.Interpolator; -import org.jboss.seam.core.Locale; -import org.testng.Assert; -import org.testng.annotations.Test; - -public class InterpolatorTest extends MockContainerTest -{ - private static final String CHOICE_EXPR = "There {0,choice,0#are no files|1#is one file|1<are {0,number,integer} files}."; - - @Override - protected Class[] getComponentsToInstall() - { - return new Class[] { Interpolator.class, Locale.class, Expressions.class }; - } - - @Test - public void testInterpolation() - { - Interpolator interpolator = Interpolator.instance(); - - Assert.assertEquals(interpolator.interpolate("#0 #1 #2", 3, 5, 7), "3 5 7"); - Assert.assertEquals(interpolator.interpolate("{0} {1} {2}", 3, 5, 7), "3 5 7"); - - // this tests that the result of an expression evaluation is not evaluated again - Assert.assertEquals(interpolator.interpolate("{1}", "bad", "{0}"), "{0}"); - - // this tests that embedded {} expressions are parsed correctly. - Assert.assertEquals(interpolator.interpolate(CHOICE_EXPR, 0), "There are no files."); - Assert.assertEquals(interpolator.interpolate(CHOICE_EXPR, 1), "There is one file."); - Assert.assertEquals(interpolator.interpolate(CHOICE_EXPR, 2), "There are 2 files."); - - // test sequences of multiple # - Assert.assertEquals(interpolator.interpolate("#0",2), "2"); - Assert.assertEquals(interpolator.interpolate("##0",2), "#2"); - Assert.assertEquals(interpolator.interpolate("###0",2), "##2"); - - // test a value expression in the mix - Contexts.getEventContext().set("contextVariable", "value"); - Assert.assertEquals(interpolator.interpolate("#{contextVariable}"), "value"); - Assert.assertEquals(interpolator.interpolate("#0 #{contextVariable} #1", "a", "z"), "a value z"); - Assert.assertEquals(interpolator.interpolate("#0 ##{contextVariable} #1", "a", "z"), "a #value z"); - - Date date = new Date(0); - - Assert.assertEquals(interpolator.interpolate("{0,date,short}", date), DateFormat.getDateInstance(DateFormat.SHORT).format(date)); - - // test that a messageformat error doesn't blow up - Assert.assertEquals(interpolator.interpolate("{nosuchmessage}"), "{nosuchmessage}"); - - try - { - interpolator.interpolate("hello #{", (Object) null); - Assert.fail("interpolator not raised an exception"); - } catch (Throwable t) - { - - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InvocationControl.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InvocationControl.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/InvocationControl.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,53 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.util.concurrent.CountDownLatch; - -public class InvocationControl -{ - private String name; - private CountDownLatch start = new CountDownLatch(1); - private CountDownLatch started = new CountDownLatch(1); - private CountDownLatch finish = new CountDownLatch(1); - private CountDownLatch finished = new CountDownLatch(1); - - public InvocationControl(String name) { - this.name = name; - } - - public String getName() { - return this.name; - } - - public void init() { - await(start); - } - - public void start() { - start.countDown(); - await(started); - } - - public void markStarted() { - started.countDown(); - await(finish); - } - - public void finish() { - finish.countDown(); - await(finished); - } - - public void markFinished() { - finished.countDown(); - } - - private void await(CountDownLatch l) { - try - { - l.await(); - } - catch (InterruptedException e) - { - } - } -} \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MailTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MailTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MailTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,367 +0,0 @@ -package org.jboss.seam.test.unit; - -import javax.mail.NoSuchProviderException; -import javax.mail.Session; -import javax.naming.NamingException; - -import org.jboss.seam.mail.MailSession; -import org.testng.annotations.Test; - -import com.sun.mail.smtp.SMTPSSLTransport; -import com.sun.mail.smtp.SMTPTransport; - -public class MailTest -{ - - private static final String HOST = "smtp.jboss.org"; - - private static final String DEFAULT_HOST = "localhost"; - - private static final int PORT = 666; - - private static final int DEFAULT_PORT = 25; - - private static final int DEFAULT_SSL_PORT = 465; - - private static final String USERNAME = "pmuir"; - - private static final String PASSWORD = "letmein"; - - private static final String EMAIL = "pete.muir(a)jboss.org"; - - @Test - public void testBasicMailSession() - { - - MailSession mailSession = new MailSession(); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - assert DEFAULT_HOST.equals(session.getProperty("mail.smtp.host")); - - int port = 0; - - try - { - port = Integer.parseInt(session.getProperty("mail.smtp.port")); - } - catch (NumberFormatException e) - { - assert false; - } - - assert port == DEFAULT_PORT; - - assert "smtp".equals(session.getProperty("mail.transport.protocol")); - - SMTPTransport transport = null; - - try - { - assert session.getTransport() instanceof SMTPTransport; - transport = (SMTPTransport) session.getTransport(); - } - catch (NoSuchProviderException e) - { - assert false; - } - - assert !session.getDebug(); - - assert transport.getStartTLS(); - - } - - @Test - public void testMailSession() - { - - MailSession mailSession = new MailSession(); - mailSession.setHost(HOST); - mailSession.setPort(PORT); - mailSession.setDebug(true); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - assert HOST.equals(session.getProperty("mail.smtp.host")); - - int port = 0; - - try - { - port = Integer.parseInt(session.getProperty("mail.smtp.port")); - } - catch (NumberFormatException e) - { - assert false; - } - - assert port == PORT; - - try - { - assert session.getTransport() instanceof SMTPTransport; - } - catch (NoSuchProviderException e) - { - assert false; - } - - assert session.getDebug(); - - } - - @Test - public void testAuthenticatedMailSession() - { - MailSession mailSession = new MailSession(); - mailSession.setUsername(USERNAME); - mailSession.setPassword(PASSWORD); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - assert Boolean.parseBoolean(session.getProperty("mail.smtp.auth")); - - // TODO Check authentication - - } - - @Test - public void testMissingPasswordMailSession() - { - MailSession mailSession = new MailSession(); - mailSession.setUsername(USERNAME); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - assert null == session.getProperty("mail.smtp.auth"); - - } - - @Test - public void testMissingUsernameMailSession() - { - MailSession mailSession = new MailSession(); - mailSession.setPassword(PASSWORD); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - assert null == session.getProperty("mail.smtp.auth"); - - } - - @Test - public void testBasicSslMailSession() - { - MailSession mailSession = new MailSession(); - - mailSession.setSsl(true); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - assert "smtps".equals(session.getProperty("mail.transport.protocol")); - - SMTPSSLTransport transport = null; - - try - { - assert session.getTransport() instanceof SMTPSSLTransport; - transport = (SMTPSSLTransport) session.getTransport(); - } - catch (NoSuchProviderException e) - { - assert false; - } - - int port = 0; - - try - { - port = Integer.parseInt(session.getProperty("mail.smtps.port")); - } - catch (NumberFormatException e) - { - assert false; - } - - assert port == DEFAULT_SSL_PORT; - - assert DEFAULT_HOST.equals(session.getProperty("mail.smtps.host")); - - assert !session.getDebug(); - - // TLS not used over SSL - assert !transport.getStartTLS(); - - } - - @Test - public void testSslMailSession() - { - MailSession mailSession = new MailSession(); - mailSession.setHost(HOST); - mailSession.setSsl(true); - mailSession.setPort(PORT); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - int port = 0; - - try - { - port = Integer.parseInt(session.getProperty("mail.smtps.port")); - } - catch (NumberFormatException e) - { - assert false; - } - - assert port == PORT; - - } - - @Test - public void testAuthenticatedSslMailSession() - { - MailSession mailSession = new MailSession(); - mailSession.setUsername(USERNAME); - mailSession.setPassword(PASSWORD); - mailSession.setSsl(true); - - mailSession.create(); - - Session session = null; - - try - { - session = mailSession.getSession(); - } - catch (NamingException e) - { - assert false; - // Naming exception can't occur if we aren't getting the Session from - // JNDI - } - - assert Boolean.parseBoolean(session.getProperty("mail.smtps.auth")); - assert session.getProperty("mail.smtp.auth") == null; - - // TODO Check authentication - - } - - @Test - public void testJndiMailSession() - { - MailSession mailSession = new MailSession(); - mailSession.setSessionJndiName("java:/Mail"); - - mailSession.create(); - - boolean failure = false; - - // We can't get a Session from JNDI without a full container. - try - { - mailSession.getSession(); - } - catch (Exception e) - { - failure = true; - } - - assert failure; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockContainerTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockContainerTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockContainerTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,54 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.Component; -import org.jboss.seam.Seam; -import org.jboss.seam.contexts.ApplicationContext; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Lifecycle; -import org.jboss.seam.contexts.ServletLifecycle; -import org.jboss.seam.core.Init; -import org.jboss.seam.core.Manager; -import org.jboss.seam.mock.MockExternalContext; -import org.jboss.seam.mock.MockServletContext; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; - -/** - * A simple base test class that registers components according to class so that - * they can be looked up successfully using ComponentClass.instance(), as - * required by much of Seam's internal API. - */ -public abstract class MockContainerTest -{ - @BeforeMethod - protected void setUp() - { - MockServletContext servletContext = new MockServletContext(); - ServletLifecycle.beginApplication(servletContext); - MockExternalContext externalContext = new MockExternalContext(servletContext); - Context appContext = new ApplicationContext(externalContext.getApplicationMap()); - installComponent(appContext, Manager.class); - for (Class c : getComponentsToInstall()) - { - installComponent(appContext, c); - } - appContext.set(Seam.getComponentName(Init.class), new Init()); - Lifecycle.beginCall(); - } - - protected Class[] getComponentsToInstall() - { - return new Class[] {}; - } - - @AfterMethod - protected void tearDown() - { - Lifecycle.endCall(); - } - - protected void installComponent(Context appContext, Class clazz) - { - appContext.set(Seam.getComponentName(clazz) + ".component", new Component(clazz)); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockInvocationContext.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockInvocationContext.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/MockInvocationContext.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,47 +0,0 @@ -//$Id: MockInvocationContext.java 6435 2007-10-08 18:15:49Z pmuir $ -package org.jboss.seam.test.unit; - -import java.lang.reflect.Method; -import java.util.Map; - -import org.jboss.seam.intercept.InvocationContext; - -public class MockInvocationContext implements InvocationContext -{ - - public Object getTarget() - { - //TODO - return null; - } - - public Map getContextData() - { - //TODO - return null; - } - - public Method getMethod() - { - //TODO - return null; - } - - public Object[] getParameters() - { - //TODO - return null; - } - - public Object proceed() throws Exception - { - return null; - } - - public void setParameters(Object[] params) - { - //TODO - - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageActionsTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageActionsTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageActionsTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,227 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.faces.FacesManager; -import org.jboss.seam.mock.MockHttpServletRequest; -import org.jboss.seam.navigation.Pages; -import org.jboss.seam.test.unit.component.TestActions; -import org.testng.annotations.Test; - -import javax.faces.context.FacesContext; -import javax.faces.render.ResponseStateManager; -import java.util.List; -import java.util.Map; - -/** - * The purpose of this test is to verify the way that page actions are handled. Once - * a page action triggers a navigation event, subsequent page actions in the chain - * should be short circuited. - */ -public class PageActionsTest extends AbstractPageTest -{ - @Override - protected void installComponents(Context appContext) - { - super.installComponents(appContext); - installComponent(appContext, NoRedirectFacesManager.class); - installComponent(appContext, TestActions.class); - } - - /** - * This test verifies that a non-null outcome will short-circuit the page - * actions. It tests two difference variations. The first variation includes - * both actions as nested elements of the page node. The second variation has - * the first action in the action attribute of the page node and the second - * action as a nested element. Aside from the placement of the actions, the - * two parts of the test are equivalent. - */ - @Test(enabled = true) - public void testShortCircuitOnNonNullOutcome() - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - TestActions testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test01a.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/pageA.xhtml"); - assertActionCalls(testActions, new String[] { "nonNullActionA" }); - - testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test01b.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/pageA.xhtml"); - assertActionCalls(testActions, new String[] { "nonNullActionA" }); - } - - /** - * This test verifies that because the first action does not result in a - * navigation, the second action is executed. However, the third action is - * not called because of the navigation on the second action. - */ - @Test(enabled = true) - public void testShortCircuitInMiddle() - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - TestActions testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test02.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/pageB.xhtml"); - assertActionCalls(testActions, new String[] { "nonNullActionA", "nonNullActionB" }); - } - - /** - * This test verifies that an action method with a null return can still match - * a navigation rule and short-circuit the remaining actions. The key is that - * a navigation rule is matched, not what the return value is. - */ - @Test(enabled = true) - public void testShortCircuitOnNullOutcome() - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - TestActions testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test03.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/pageA.xhtml"); - assertActionCalls(testActions, new String[] { "nullActionA" }); - } - - /** - * Verify that the first non-null outcome, even if it is to the same view id, - * will short circuit the action calls. - */ - @Test(enabled = true) - public void testShortCircuitOnNonNullOutcomeToSamePage() - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - TestActions testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test04.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/action-test04.xhtml"); - assertActionCalls(testActions, new String[] { "nullActionA", "nonNullActionB" }); - } - - /** - * Same as testShortCircuitOnNonNullOutcome except that the navigation rules - * are redirects rather than renders. - */ - @Test(enabled = true) - public void testShortCircuitOnNonNullOutcomeWithRedirect() - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - TestActions testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test05.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/action-test05.xhtml"); - assertActionCalls(testActions, new String[] { "nonNullActionA" }); - assert Contexts.getEventContext().get("lastRedirectViewId").equals("/pageA.xhtml") : - "Expecting a redirect to /pageA.xhtml but redirected to " + Contexts.getEventContext().get("lastRedirectViewId"); - assert facesContext.getResponseComplete() == true : "The response should have been marked as complete"; - } - - /** - * Verify that only those actions without on-postback="false" are executed when the - * magic postback parameter (javax.faces.ViewState) is present in the request map. - */ - @Test(enabled = true) - public void testPostbackConditionOnPageAction() - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - simulatePostback(facesContext); - TestActions testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test06.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/action-test06.xhtml"); - assertActionCalls(testActions, new String[] { "nonNullActionA" }); - } - - /** - * This test is here (and disabled) to demonstrate the old behavior. All page - * actions would be executed regardless and navigations could cross page - * declaration boundaries since the view id is changing mid-run (hence - * resulting in different navigation rule matches) - */ - @Test(enabled = false) - public void oldBehaviorTest() - { - FacesContext facesContext = FacesContext.getCurrentInstance(); - TestActions testActions = TestActions.instance(); - - facesContext.getViewRoot().setViewId("/action-test99a.xhtml"); - Pages.instance().preRender(facesContext); - assertViewId(facesContext, "/pageB.xhtml"); - assertActionCalls(testActions, new String[] { "nonNullActionA", "nonNullActionB" }); - } - - private void assertViewId(FacesContext facesContext, String expectedViewId) - { - String actualViewId = facesContext.getViewRoot().getViewId(); - assert expectedViewId.equals(actualViewId) : - "Expected viewId to be " + expectedViewId + ", but got " + actualViewId; - } - - private void assertActionCalls(TestActions testActions, String[] methodNames) - { - List<String> actionsCalled = testActions.getActionsCalled(); - assert actionsCalled.size() == methodNames.length : - "Expected " + methodNames.length + " action(s) to be called, but executed " + actionsCalled.size() + " action(s) instead"; - String expectedMethodCalls = ""; - for (int i = 0, len = methodNames.length; i < len; i++) - { - if (i > 0) - { - expectedMethodCalls += ", "; - } - expectedMethodCalls += methodNames[i]; - } - String actualMethodCalls = ""; - for (int i = 0, len = actionsCalled.size(); i < len; i++) - { - if (i > 0) - { - actualMethodCalls += ", "; - } - actualMethodCalls += actionsCalled.get(i); - } - - assert expectedMethodCalls.equals(actualMethodCalls) : - "Expected actions to be called: " + expectedMethodCalls + "; actions actually called: " + actualMethodCalls; - - Contexts.getEventContext().remove(Component.getComponentName(TestActions.class)); - } - - private void simulatePostback(FacesContext facesContext) - { - MockHttpServletRequest request = (MockHttpServletRequest) facesContext.getExternalContext().getRequest(); - request.getParameters().put(ResponseStateManager.VIEW_STATE_PARAM, new String[] { "true" }); - assert facesContext.getRenderKit().getResponseStateManager().isPostback(facesContext) == true; - } - - @Scope(ScopeType.EVENT) - @Name("org.jboss.seam.core.manager") - @BypassInterceptors - public static class NoRedirectFacesManager extends FacesManager { - - @Override - public void redirect(String viewId, Map<String, Object> parameters, boolean includeConversationId, boolean includePageParams) - { - Contexts.getEventContext().set("lastRedirectViewId", viewId); - // a lot of shit happens we don't need; the important part is that the - // viewId is not changed on FacesContext, but the response is marked complete - FacesContext.getCurrentInstance().responseComplete(); - } - - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageConversationControlTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageConversationControlTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageConversationControlTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,105 +0,0 @@ -package org.jboss.seam.test.unit; - -import javax.faces.context.FacesContext; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.FacesLifecycle; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.core.ConversationEntries; -import org.jboss.seam.core.Events; -import org.jboss.seam.core.Manager; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.navigation.Pages; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -/** - * Tests that validate the ConversationControl component as initialized for a Page instance. - * - * @author Jacob Orshalick - */ -public class PageConversationControlTest extends AbstractPageTest -{ - /** - * Override the base setup to add the required conversation components included in testing. - */ - @BeforeMethod - @Override - public void setup() - { - super.setup(); - - installComponent(Contexts.getApplicationContext(), ConversationEntries.class); - installComponent(Contexts.getApplicationContext(), Conversation.class); - installComponent(Contexts.getApplicationContext(), FacesMessages.class); - installComponent(Contexts.getApplicationContext(), Manager.class); - installComponent(Contexts.getApplicationContext(), Events.class); - - Manager.instance().initializeTemporaryConversation(); - FacesLifecycle.resumeConversation(FacesContext.getCurrentInstance().getExternalContext()); - } - - /** - * Tests that when a nested conversation encounters an end-conversation tag the nested conversation is - * demoted to temporary. - */ - @Test - public void testBeginNestedAndEndConversation() { - Manager.instance().beginConversation(); - Manager.instance().beginNestedConversation(); - - assert Manager.instance().isLongRunningConversation(); - assert Manager.instance().isNestedConversation(); - - FacesContext facesContext = FacesContext.getCurrentInstance(); - - facesContext.getViewRoot().setViewId("/end-conversation-test.xhtml"); - Pages.instance().preRender(facesContext); - - // nested conversation should be demoted to temporary - assert !Manager.instance().isLongRunningConversation(); - assert Manager.instance().isNestedConversation(); - } - - /** - * Tests that when a non-nested conversation encounters an end-conversation tag specifying that the root - * should be ended the current conversation is simply demoted to temporary. - */ - @Test - public void testBeginAndEndRootConversation() { - Manager.instance().beginConversation(); - - assert Manager.instance().isLongRunningConversation(); - - FacesContext facesContext = FacesContext.getCurrentInstance(); - - facesContext.getViewRoot().setViewId("/end-root-conversation-test.xhtml"); - Pages.instance().preRender(facesContext); - - assert !Manager.instance().isLongRunningConversation(); - } - - /** - * Tests that when a nested conversation encounters an end-conversation tag specifying that the root - * should be ended the root is ended thereby destroying the conversation stack. - */ - @Test - public void testBeginNestedAndEndRootConversation() { - Manager.instance().beginConversation(); - String rootConversationId = Manager.instance().getCurrentConversationId(); - - Manager.instance().beginNestedConversation(); - - assert !Manager.instance().getCurrentConversationId().equals(rootConversationId); - assert Manager.instance().isLongRunningConversation(); - assert Manager.instance().isNestedConversation(); - - FacesContext facesContext = FacesContext.getCurrentInstance(); - - facesContext.getViewRoot().setViewId("/end-root-conversation-test.xhtml"); - Pages.instance().preRender(facesContext); - - assert Manager.instance().getCurrentConversationId().equals(rootConversationId); - assert !Manager.instance().isLongRunningConversation(); - assert !Manager.instance().isNestedConversation(); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageDescriptorTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageDescriptorTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageDescriptorTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,58 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.navigation.Pages; -import org.testng.annotations.Test; - -/** - * This test verifies that the page descriptor is parsed correctly and that the - * Page instance returned by the Pages component are based on the matching Page - * definition as well as any matching wild-card pages in the page stack. - */ -public class PageDescriptorTest extends AbstractPageTest -{ - /** - * Verify that the switch enabled flag is true by default, but false - * for the debug page. - */ - @Test(enabled = true) - public void testSwitchEnabledFlag() - { - Pages pages = Pages.instance(); - - assert pages.getPage("/action-test01a.xhtml").isSwitchEnabled(); - assert !pages.getPage("/debug.xhtml").isSwitchEnabled(); - } - - /** - * Verify that the Pages component determines when a description exists in the Page stack and when - * it does not. - */ - @Test(enabled = true) - public void testHasDescription() - { - Pages pages = Pages.instance(); - - assert pages.hasDescription("/action-test01b.xhtml"); - assert pages.hasDescription("/action-test01a.xhtml"); - assert !pages.hasDescription("/action-test02.xhtml"); - } - - /** - * Verify that the description can be retrieved from the page stack when a wild-card view-id - * description has been specified. Also verifies that a description specific to a page overrides - * the wild-card description. - */ - @Test(enabled = true) - public void testGetAndResolveDescription() - { - Pages pages = Pages.instance(); - String fineDescription = "fine-description"; - Contexts.getEventContext().set("fineDescription", fineDescription); - - assert "coarse-description".equals(pages.getDescription("/action-test01a.xhtml")) : - "Expecting the wild-card description to be returned as no description was provided for the view-id"; - assert fineDescription.equals(pages.renderDescription("/action-test01b.xhtml")) : - "Expecting the description for the view-id to be returned"; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageParamTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageParamTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageParamTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,163 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.util.Date; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.IntegerConverter; -import javax.faces.validator.Validator; -import javax.faces.validator.ValidatorException; - -import javax.validation.constraints.Size; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.Expressions; -import org.jboss.seam.core.Validators; -import org.jboss.seam.faces.DateConverter; -import org.jboss.seam.mock.EnhancedMockHttpServletRequest; -import org.jboss.seam.navigation.Pages; -import org.jboss.seam.navigation.Param; -import org.testng.annotations.Test; - -/** - * Verifies that page parameters are setup properly and report the correct information - * about validators and converters. - * - * @author Dan Allen - */ -public class PageParamTest extends AbstractPageTest -{ - @Test - public void testGetConverterById() - { - String converterId = "javax.faces.Integer"; - String converterClass = "javax.faces.convert.IntegerConverter"; - Param param = new Param("param"); - param.setConverterId(converterId); - assert param.getConverter() instanceof IntegerConverter : "expecting: " + converterClass + "; got: " + param.getConverter(); - } - - /** - * Verify EL expression disability in actionOutcome parameter - */ - @Test(expectedExceptions = IllegalArgumentException.class ) - public void testGetCallAction() - { - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(); - request.addParameter("actionOutcome", "#{variable}"); - FacesContext.getCurrentInstance().getExternalContext().setRequest(request); - Pages.instance().preRender(FacesContext.getCurrentInstance()); - } - - @Test(expectedExceptions = IllegalArgumentException.class ) - public void testGetCallActionEscaped() - { - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(); - request.addParameter("actionOutcome", "%3d%23%7dvariable%7b"); - FacesContext.getCurrentInstance().getExternalContext().setRequest(request); - Pages.instance().preRender(FacesContext.getCurrentInstance()); - } - - /** - * Verify that converter is null when the parameter value is a value expression and - * we are operating outside of a FacesContext. - * @jira JBSEAM-3674 - */ - @Test - public void testConverterIsNullForNonFacesValueExpression() - { - Param param = new Param("param"); - param.setValueExpression(Expressions.instance().createValueExpression("#{variable}")); - assert param.getConverter() == null; - } - - @Test - public void testDateConverter() - { - Param param = setupParam(false); - - assert DateConverter.class.equals(param.getConverter().getClass()); - - } - - @Test - public void testGetValidatorById() throws ClassNotFoundException - { - String validatorId = "TestValidator"; - String validatorClass= "org.jboss.seam.test.unit.PageParamTest$TestValidator"; - FacesContext.getCurrentInstance().getApplication().addValidator(validatorId, validatorClass); - Param param = new Param("param"); - param.setValidatorId(validatorId); - assert param.getValidator() instanceof TestValidator : "expecting: " + validatorClass + "; got: " + param.getValidator(); - } - - @Test(expectedExceptions = ValidatorException.class) - public void testValidateModelWithInvalidValue() - { - setupParamToValidate(false).validateConvertedValue(FacesContext.getCurrentInstance(), "a"); - } - - @Test - public void testValidateModelWithValidValue() - { - setupParamToValidate(false).validateConvertedValue(FacesContext.getCurrentInstance(), "aaa"); - } - - @Test - public void testValidateModelDisabled() - { - setupParamToValidate(true).validateConvertedValue(FacesContext.getCurrentInstance(), "a"); - } - - protected Param setupParamToValidate(boolean disableModelValidator) - { - installComponent(Contexts.getApplicationContext(), Validators.class); - Param param = new Param("value"); - param.setValueExpression(Expressions.instance().createValueExpression("#{bean.value}")); - Contexts.getEventContext().set("bean", new Bean()); - if (disableModelValidator) { - param.setValidateModel(false); - } - return param; - } - - protected Param setupParam(boolean disableModelValidator) - { - installComponent(Contexts.getApplicationContext(), DateConverter.class); - Param param = new Param("birthDate"); - param.setValueExpression(Expressions.instance().createValueExpression("#{bean.birthDate}")); - Bean bean = new Bean(); - bean.setBirthDate(new Date()); - Contexts.getEventContext().set("bean", bean); - if (disableModelValidator) { - param.setValidateModel(false); - } - return param; - } - - public static class TestValidator implements Validator - { - public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException - { - } - } - - class Bean { - private String value; - private Date birthDate; - public Date getBirthDate() - { - return birthDate; - } - public void setBirthDate(Date birth) - { - this.birthDate = birth; - } - @Size(min = 3, max = 10) - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowConfigurationTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowConfigurationTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowConfigurationTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,38 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; -import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.exe.ProcessInstance; -import org.testng.annotations.Test; - -public class PageflowConfigurationTest{ - - static JbpmConfiguration pageflowConfiguration = JbpmConfiguration.parseResource("org/jboss/seam/bpm/jbpm.pageflow.cfg.xml"); - - @Test - public void testOne() { - JbpmContext jbpmContext = pageflowConfiguration.createJbpmContext(); - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition name='navigation'>" + - " <start-state name='start'>" + - " <transition to='a' />" + - " </start-state>" + - " <state name='a'>" + - " <transition to='end' />" + - " </state>" + - " <end-state name='end' />" + - "</process-definition>" - ); - - ProcessInstance processInstance = processDefinition.createProcessInstance(); - - processInstance.signal(); - processInstance.signal(); - - assert processInstance.hasEnded(); - - jbpmContext.close(); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PageflowTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,110 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.io.StringReader; - -import org.jboss.seam.bpm.PageflowParser; -import org.jboss.seam.pageflow.Page; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; -import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.graph.exe.Token; -import org.jbpm.graph.node.StartState; -import org.testng.annotations.Test; - -public class PageflowTest -{ - - JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString( - "<jbpm-configuration />" - ); - - @Test - public void testPageflowWithStartState() { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - - StringReader stringReader = new StringReader( - "<pageflow-definition name='hoepla'>" + - " <start-state name='start' />" + - "</pageflow-definition>" - ); - PageflowParser pageflowParser = new PageflowParser(stringReader); - ProcessDefinition processDefinition = pageflowParser.readProcessDefinition(); - assert "start".equals(processDefinition.getStartState().getName()); - - jbpmContext.close(); - } - - @Test - public void testPageflowWithStartPage() { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - StringReader stringReader = new StringReader( - "<pageflow-definition name='hoepla'>" + - " <start-page name='start' view-id='/start.xhtml'/>" + - "</pageflow-definition>"); - PageflowParser pageflowParser = new PageflowParser(stringReader); - ProcessDefinition processDefinition = pageflowParser.readProcessDefinition(); - - assert "start".equals(processDefinition.getStartState().getName()); - - jbpmContext.close(); - } - - @Test - public void testPageflowWithStartPageAttribute() { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - - StringReader stringReader = new StringReader( - "<pageflow-definition name='hoepla' start-page='start'>" + - " <page name='start' view-id='/start.xhtml'/>" + - "</pageflow-definition>" - ); - PageflowParser pageflowParser = new PageflowParser(stringReader); - ProcessDefinition processDefinition = pageflowParser.readProcessDefinition(); - assert "start".equals(processDefinition.getStartState().getName()); - - jbpmContext.close(); - } - - @Test - public void testOrderPageflow() { - StringReader stringReader = new StringReader( - "<pageflow-definition name='checkout'>" + - " <start-state name='start'>" + - " <transition to='confirm'/>" + - " </start-state>" + - " <page name='confirm' view-id='/confirm.xhtml'>" + - " <redirect/>" + - " <transition name='update' to='continue'/>" + - " <transition name='purchase' to='complete'>" + - " <action expression='#{checkout.submitOrder}' />" + - " </transition>" + - " </page>" + - " <page name='complete' view-id='/complete.xhtml'>" + - " <redirect/>" + - " <end-conversation/>" + - " </page>" + - " <page name='continue' view-id='/browse.xhtml'>" + - " <end-conversation/>" + - " </page>" + - "</pageflow-definition>" - ); - PageflowParser pageflowParser = new PageflowParser(stringReader); - ProcessDefinition processDefinition = pageflowParser.readProcessDefinition(); - - StartState start = (StartState) processDefinition.getStartState(); - Page confirm = (Page) processDefinition.getNode("confirm"); - Page complete = (Page) processDefinition.getNode("complete"); - Page cont = (Page) processDefinition.getNode("continue"); - assert confirm!=null; - assert complete!=null; - assert cont!=null; - - ProcessInstance processInstance = new ProcessInstance(processDefinition); - Token token = processInstance.getRootToken(); - assert start.equals(token.getNode()); - - processInstance.signal(); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PasswordHashTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PasswordHashTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PasswordHashTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,25 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.security.management.PasswordHash; -import org.testng.annotations.Test; - -public class PasswordHashTest -{ - @SuppressWarnings("deprecation") - @Test - public void testMd5Hash() - { - PasswordHash passwordHash = new PasswordHash(); - String hash = passwordHash.generateHash("secret", "MD5"); - assert hash.equals("Xr4ilOzQ4PCOq3aQ0qbuaQ=="); - } - - @SuppressWarnings("deprecation") - @Test - public void testShaHash() - { - PasswordHash passwordHash = new PasswordHash(); - String hash = passwordHash.generateHash("secret", "SHA"); - assert hash.equals("5en6G6MezRroT3XKqkdPOmY/BfQ="); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/People.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/People.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/People.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,35 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.datamodel.DataModelSelection; - -@Name("people") -public class People -{ - @org.jboss.seam.annotations.datamodel.DataModel(scope=ScopeType.PAGE) - private List<Person> peopleList; - - @DataModelSelection - private Person selectedPerson; - - @Factory("peopleList") - public void peopleFactory() - { - peopleList = new ArrayList<Person>(); - peopleList.add(new Person("Gavin")); - peopleList.add(new Person("Pete")); - peopleList.add(new Person("Shane")); - peopleList.add(new Person("Norman")); - } - - public Person getSelectedPerson() - { - return selectedPerson; - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Person.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Person.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/Person.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,45 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.io.Serializable; - -import org.jboss.seam.annotations.Name; - - -@Name("person") -public class Person implements Serializable -{ - - public Person(String name) - { - this.name = name; - } - - public Person() {} - - private String name; - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - @Override - public boolean equals(Object other) - { - if (other instanceof Person) - { - Person that = (Person) other; - return (this.name == null && that.name == null) || (this.name != null && this.name.equals(that.name)); - } - else - { - return false; - } - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/PhaseListenerTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,354 +0,0 @@ -//$Id: PhaseListenerTest.java 6435 2007-10-08 18:15:49Z pmuir $ -package org.jboss.seam.test.unit; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.faces.context.ExternalContext; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.servlet.http.HttpServletRequest; - -import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.Seam; -import org.jboss.seam.contexts.ApplicationContext; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.SessionContext; -import org.jboss.seam.core.Conversation; -import org.jboss.seam.core.ConversationEntries; -import org.jboss.seam.core.ConversationPropagation; -import org.jboss.seam.core.Events; -import org.jboss.seam.core.Init; -import org.jboss.seam.core.Manager; -import org.jboss.seam.core.ResourceLoader; -import org.jboss.seam.faces.FacesManager; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.faces.FacesPage; -import org.jboss.seam.faces.Validation; -import org.jboss.seam.jsf.SeamPhaseListener; -import org.jboss.seam.jsf.SeamStateManager; -import org.jboss.seam.mock.MockApplication; -import org.jboss.seam.mock.MockExternalContext; -import org.jboss.seam.mock.MockFacesContext; -import org.jboss.seam.mock.MockLifecycle; -import org.jboss.seam.navigation.Pages; -import org.jboss.seam.servlet.ServletRequestSessionMap; -import org.jboss.seam.web.Session; -import org.testng.annotations.Test; - -public class PhaseListenerTest -{ - private void installComponents(Context appContext) - { - Init init = new Init(); - init.setTransactionManagementEnabled(false); - appContext.set( Seam.getComponentName(Init.class), init ); - installComponent(appContext, FacesManager.class); - installComponent(appContext, ConversationEntries.class); - installComponent(appContext, FacesPage.class); - installComponent(appContext, Conversation.class); - installComponent(appContext, FacesMessages.class); - installComponent(appContext, Pages.class); - installComponent(appContext, Events.class); - installComponent(appContext, Validation.class); - installComponent(appContext, Session.class); - installComponent(appContext, ConversationPropagation.class); - installComponent(appContext, ResourceLoader.class); - } - - private void installComponent(Context appContext, Class clazz) - { - appContext.set( Seam.getComponentName(clazz) + ".component", new Component(clazz) ); - } - - private MockFacesContext createFacesContext() - { - ExternalContext externalContext = new MockExternalContext(); - MockFacesContext facesContext = new MockFacesContext( externalContext, new MockApplication() ); - facesContext.setCurrent().createViewRoot(); - facesContext.getApplication().setStateManager( new SeamStateManager( facesContext.getApplication().getStateManager() ) ); - - Context appContext = new ApplicationContext( externalContext.getApplicationMap() ); - installComponents(appContext); - return facesContext; - } - - @Test - public void testSeamPhaseListener() - { - MockFacesContext facesContext = createFacesContext(); - SeamPhaseListener phases = new SeamPhaseListener(); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isConversationContextActive(); - assert !Manager.instance().isLongRunningConversation(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - assert !Manager.instance().isLongRunningConversation(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert facesContext.getViewRoot().getViewMap().size()==1; - assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null; - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert Contexts.isConversationContextActive(); - - facesContext.getApplication().getStateManager().saveView(facesContext); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - } - - private String getPrefix() - { - return ScopeType.PAGE.getPrefix() + '$'; - } - - @SuppressWarnings("serial") - @Test - public void testSeamPhaseListenerLongRunning() - { - MockFacesContext facesContext = createFacesContext(); - - getPageMap(facesContext).put( getPrefix() + Seam.getComponentName(FacesPage.class), new FacesPage() { @Override public String getConversationId() { return "2"; } }); - - List<String> conversationIdStack = new ArrayList<String>(); - conversationIdStack.add("2"); - ConversationEntries entries = new ConversationEntries(); - entries.createConversationEntry("2", conversationIdStack); - SessionContext sessionContext = new SessionContext( new ServletRequestSessionMap( (HttpServletRequest) facesContext.getExternalContext().getRequest() ) ); - sessionContext.set( Seam.getComponentName(ConversationEntries.class), entries ); - - SeamPhaseListener phases = new SeamPhaseListener(); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isConversationContextActive(); - assert Manager.instance().isLongRunningConversation(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - assert Manager.instance().isLongRunningConversation(); - - facesContext.getViewRoot().getAttributes().clear(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert Contexts.isConversationContextActive(); - - facesContext.getApplication().getStateManager().saveView(facesContext); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId().equals("2"); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - } - - private Map getPageMap(MockFacesContext facesContext) - { - return facesContext.getViewRoot().getViewMap(); - } - - @Test - public void testSeamPhaseListenerNewLongRunning() - { - MockFacesContext facesContext = createFacesContext(); - - SeamPhaseListener phases = new SeamPhaseListener(); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isConversationContextActive(); - assert !Manager.instance().isLongRunningConversation(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - Manager.instance().beginConversation(); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - assert Manager.instance().isLongRunningConversation(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert Contexts.isConversationContextActive(); - - facesContext.getApplication().getStateManager().saveView(facesContext); - - assert facesContext.getViewRoot().getViewMap().size()==1; - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - } - - @Test - public void testSeamPhaseListenerRedirect() - { - MockFacesContext facesContext = createFacesContext(); - SeamPhaseListener phases = new SeamPhaseListener(); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isConversationContextActive(); - assert !Manager.instance().isLongRunningConversation(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.APPLY_REQUEST_VALUES, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.PROCESS_VALIDATIONS, MockLifecycle.INSTANCE ) ); - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.UPDATE_MODEL_VALUES, MockLifecycle.INSTANCE ) ); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - facesContext.responseComplete(); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.INVOKE_APPLICATION, MockLifecycle.INSTANCE ) ); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - } - - @Test - public void testSeamPhaseListenerNonFacesRequest() - { - MockFacesContext facesContext = createFacesContext(); - SeamPhaseListener phases = new SeamPhaseListener(); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RESTORE_VIEW, MockLifecycle.INSTANCE ) ); - - assert Contexts.isConversationContextActive(); - assert !Manager.instance().isLongRunningConversation(); - - phases.beforePhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert facesContext.getViewRoot().getViewMap().size()==1; - assert ( (FacesPage) getPageMap(facesContext).get( getPrefix() + Seam.getComponentName(FacesPage.class) ) ).getConversationId()==null; - assert Contexts.isEventContextActive(); - assert Contexts.isSessionContextActive(); - assert Contexts.isApplicationContextActive(); - assert Contexts.isConversationContextActive(); - - facesContext.getApplication().getStateManager().saveView(facesContext); - - phases.afterPhase( new PhaseEvent(facesContext, PhaseId.RENDER_RESPONSE, MockLifecycle.INSTANCE ) ); - - assert !Contexts.isEventContextActive(); - assert !Contexts.isSessionContextActive(); - assert !Contexts.isApplicationContextActive(); - assert !Contexts.isConversationContextActive(); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/QueryTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/QueryTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/QueryTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,110 +0,0 @@ -package org.jboss.seam.test.unit; - -import org.jboss.seam.framework.EntityQuery; -import org.testng.annotations.Test; -import static org.testng.Assert.*; - -public class QueryTest -{ - /** - * These tests verify that the count query is properly extracted from the rendered - * query. There are two points of focus. The first is that "join fetch" is replaced - * with "join" in the where clause. The second is that the subject of the query is - * used in the count() function unless the query does not have an explicit subject, - * in which case a * is used instead. - */ - @Test - public void testCountQuery() { - UnitQuery query = new UnitQuery(); - query.setEjbql("from Person p"); - query.parseEjbql(); - assertEquals(query.getCountEjbql(), "select count(*) from Person p"); - - query.setEjbql("from Person p where p.location is not null"); - query.setOrderColumn("username"); - query.parseEjbql(); - assertEquals(query.getCountEjbql(), "select count(*) from Person p where p.location is not null"); - - query.setEjbql("select p from Person p"); - query.setOrderColumn("username"); - query.parseEjbql(); - // TODO this should eventually become count(p) - assertEquals(query.getCountEjbql(), "select count(*) from Person p"); - - // trying to reproduce bug JBSEAM-4694 - query.setUseWildcardAsCountQuerySubject(false); - query.setEjbql("select distinct p from Person p"); - query.setOrderColumn("username"); - query.parseEjbql(); - // TODO this should eventually become count(p) - assertEquals(query.getCountEjbql(), "select count(distinct p) from Person p"); - query.setUseWildcardAsCountQuerySubject(true); - - query.setEjbql("select v from Vehicle v join fetch v.person"); - query.setOrderColumn("make"); - query.parseEjbql(); - // TODO this should eventually become count(v) - assertEquals(query.getCountEjbql(), "select count(*) from Vehicle v join v.person"); - - query.setEjbql("select v.person from Vehicle v left join fetch v.person"); - query.parseEjbql(); - // TODO this should eventually become count(v.person) - assertEquals(query.getCountEjbql(), "select count(*) from Vehicle v left join v.person"); - - query.setEjbql("select v.person, v.color from Vehicle v"); - query.parseEjbql(); - assertEquals(query.getCountEjbql(), "select count(*) from Vehicle v"); - -// query = new CompliantUnitQuery(); - query.setUseWildcardAsCountQuerySubject(false); - query.setEjbql("select p from Person p"); - query.parseEjbql(); - assertEquals(query.getCountEjbql(), "select count(p) from Person p"); - } - - @Test - public void testCountQueryWithGroupBy() - { - UnitQuery query = new UnitQuery(); - query.setEjbql("select min(e.birthYear), count(*) from Person p group by p.birthYear"); - query.setGroupBy("p.birthYear"); - query.parseEjbql(); - assertEquals(query.getCountEjbql() , "select count(*) from Person p"); - - } - - class UnitQuery extends EntityQuery { - - @Override - protected void parseEjbql() - { - super.parseEjbql(); - } - - @Override - protected String getRenderedEjbql() - { - return super.getRenderedEjbql(); - } - - @Override - protected String getCountEjbql() - { - return super.getCountEjbql(); - } - - /** Making setter method accessible for reproducing JBSEAM-4694. */ - public void setUseWildcardAsCountQuerySubject(boolean useCompliantCountQuerySubject) { - super.setUseWildcardAsCountQuerySubject(useCompliantCountQuerySubject); - } - - } - -// class CompliantUnitQuery extends UnitQuery { -// -// public CompliantUnitQuery() { -// setUseWildcardAsCountQuerySubject(false); -// } -// -// } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/SeamTextTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/SeamTextTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/SeamTextTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,18 +0,0 @@ -package org.jboss.seam.test.unit; - -import java.io.InputStreamReader; -import java.io.Reader; - -import org.jboss.seam.text.SeamTextLexer; -import org.jboss.seam.text.SeamTextParser; - -public class SeamTextTest -{ - public static void main(String[] args) throws Exception { - Reader r = new InputStreamReader( SeamTextTest.class.getResourceAsStream("SeamTextTest.txt") ); - SeamTextLexer lexer = new SeamTextLexer(r); - SeamTextParser parser = new SeamTextParser(lexer); - parser.startRule(); - System.out.println(parser); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/ActorTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/ActorTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/ActorTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,72 +0,0 @@ -package org.jboss.seam.test.unit.bpm; - -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import org.jboss.seam.bpm.Actor; -import org.testng.annotations.Test; - -/** - * @author Pete Muir - * - */ -public class ActorTest -{ - - @Test - public void testActorDirtyChecking() - { - // Test dirty checking on id - Actor actor = new Actor(); - assert !actor.clearDirty(); - actor.setId("gavin"); - assert actor.clearDirty(); - actor.setId("pete"); - assert actor.clearDirty(); - - // Test dirty checking on group actor ids - actor.getGroupActorIds().add("manager"); - assert actor.clearDirty(); - actor.getGroupActorIds().remove("manager"); - assert actor.clearDirty(); - actor.getGroupActorIds().add("director"); - actor.clearDirty(); - assert !actor.clearDirty(); - actor.getGroupActorIds().clear(); - assert actor.clearDirty(); - - - Set<String> someAdditions = new HashSet<String>(); - someAdditions.add("engineering manager"); - someAdditions.add("sales manager"); - Set<String> additions = new HashSet<String>(); - additions.add("marketing manager"); - additions.addAll(someAdditions); - actor.getGroupActorIds().addAll(additions); - assert actor.getGroupActorIds().size() == 3; - assert actor.clearDirty(); - actor.getGroupActorIds().removeAll(additions); - assert actor.clearDirty(); - assert actor.getGroupActorIds().size() == 0; - - actor.getGroupActorIds().addAll(additions); - assert actor.getGroupActorIds().size() == 3; - actor.clearDirty(); - actor.getGroupActorIds().retainAll(someAdditions); - assert actor.clearDirty(); - assert actor.getGroupActorIds().size() == 2; - - // Test dirt checking on group actor ids iterator - actor.getGroupActorIds().add("slave"); - actor.clearDirty(); - Iterator it = actor.getGroupActorIds().iterator(); - assert it.hasNext(); - it.next(); - it.remove(); - assert actor.clearDirty(); - - - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/JbpmTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/JbpmTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/JbpmTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,57 +0,0 @@ -package org.jboss.seam.test.unit.bpm; - -import org.jboss.seam.bpm.Jbpm; -import org.jbpm.graph.def.ProcessDefinition; -import org.testng.annotations.Test; - -/** - * @author Marek Novotny - * - */ -public class JbpmTest -{ - - private static final String PROCESS_DEFINITION = "<process-definition name=\"test\"> " + - "<start-state name=\"start\"> " + - " <transition to=\"decision\" /> " + - "</start-state> " + - "<decision name=\"decision\"> " + - " <transition to=\"done\" name=\"true\" />" + - " <transition to=\"done\" name=\"false\" /> " + - "</decision> " + - "<end-state name=\"done\"/> " + - "</process-definition>"; - - private static final String PAGE_FLOW_DEFINITION = "<pageflow-definition name=\"newuser\" >" + - "<start-state name=\"start\">" + - " <transition to=\"account\"/>" + - "</start-state>" + - "<page name=\"account\" view-id=\"/newuser/account.xhtml\">" + - " <redirect/>" + - " <transition name=\"next\" to=\"checkPassword\" />" + - "</page>" + - "</pageflow-definition>" ; - - @Test - public void testGetProcessDefinitionFromXml() - { - - Jbpm jbpm = new Jbpm(); - ProcessDefinition pd = jbpm.getProcessDefinitionFromXml(PROCESS_DEFINITION); - assert "start".equals(pd.getStartState().getName()); - assert "test".equals(pd.getName()); - - } - - @Test - public void testGetPageflowDefinitionFromXml() - { - - Jbpm jbpm = new Jbpm(); - ProcessDefinition pd = jbpm.getPageflowDefinitionFromXml(PAGE_FLOW_DEFINITION); - assert "start".equals(pd.getStartState().getName()); - assert "newuser".equals(pd.getName()); - - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/TaskListTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/TaskListTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/bpm/TaskListTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,64 +0,0 @@ -package org.jboss.seam.test.unit.bpm; - -import java.util.HashMap; - -import javax.transaction.Status; -import javax.transaction.SystemException; - -import org.jboss.seam.Component; -import org.jboss.seam.Seam; -import org.jboss.seam.bpm.Actor; -import org.jboss.seam.bpm.PooledTaskInstanceList; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.Lifecycle; -import org.jboss.seam.init.Initialization; -import org.jboss.seam.mock.MockServletContext; -import org.jboss.seam.transaction.NoTransaction; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - -public class TaskListTest -{ - @BeforeMethod - protected void setUp() - { - Lifecycle.beginApplication(new HashMap<String, Object>()); - new Initialization(new MockServletContext()).create().init(); - Lifecycle.setupApplication(); - installComponent(Contexts.getApplicationContext(), Actor.class); - installComponent(Contexts.getApplicationContext(), PooledTaskInstanceList.class); - installComponent(Contexts.getApplicationContext(), MockRolledBackTransaction.class); - Lifecycle.beginCall(); - } - - @Test - public void emptyPooledTaskListIfNoGroupActorIds() - { - Object pooledTaskInstanceList = Component.getInstance("org.jboss.seam.bpm.pooledTaskInstanceList"); - assert pooledTaskInstanceList == null; - } - - @AfterMethod - protected void tearDown() - { - Lifecycle.endApplication(); - } - - private void installComponent(Context appContext, Class clazz) - { - appContext.set(Seam.getComponentName(clazz) + ".component", new Component(clazz)); - } - - public static class MockRolledBackTransaction extends NoTransaction - { - - @Override - public int getStatus() throws SystemException - { - return Status.STATUS_MARKED_ROLLBACK; - } - - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/ConfigurableComponent.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/ConfigurableComponent.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/ConfigurableComponent.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,18 +0,0 @@ -package org.jboss.seam.test.unit.component; - -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; - -@Name("configurableComponent") -@Install(false) -public class ConfigurableComponent { - private PrimaryColor primaryColor; - - public PrimaryColor getPrimaryColor() { - return primaryColor; - } - - public void setPrimaryColor( PrimaryColor primaryColor ) { - this.primaryColor = primaryColor; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/MyEntityHome.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/MyEntityHome.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/MyEntityHome.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,19 +0,0 @@ -package org.jboss.seam.test.unit.component; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.framework.EntityHome; -import org.jboss.seam.test.unit.entity.SimpleEntity; - -@Name("myEntityHome") -public class MyEntityHome extends EntityHome<SimpleEntity> -{ - @Override - public void create() - { - if ( getEntityClass()==null ) - { - throw new IllegalStateException("entityClass is null"); - } - initDefaultMessages(); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/PrimaryColor.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/PrimaryColor.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/PrimaryColor.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,5 +0,0 @@ -package org.jboss.seam.test.unit.component; - -public enum PrimaryColor { - RED, GREEN, BLUE; -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/TestActions.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/TestActions.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/component/TestActions.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,51 +0,0 @@ -package org.jboss.seam.test.unit.component; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.Component; -import org.jboss.seam.annotations.Name; - -/** - * A bunch of test actions to be used in unit tests. - */ -@Name("testActions") -public class TestActions -{ - private List<String> actionsCalled = new ArrayList<String>(); - - public String nonNullActionA() { - actionsCalled.add("nonNullActionA"); - return "outcomeA"; - } - - public String nonNullActionB() { - actionsCalled.add("nonNullActionB"); - return "outcomeB"; - } - - public String nonNullActionC() { - actionsCalled.add("nonNullActionC"); - return "outcomeC"; - } - - public void nullActionA() { - actionsCalled.add("nullActionA"); - } - - public void nullActionB() { - actionsCalled.add("nullActionB"); - } - - public void nullActionC() { - actionsCalled.add("nullActionC"); - } - - public List<String> getActionsCalled() { - return actionsCalled; - } - - public static TestActions instance() { - return (TestActions) Component.getInstance(TestActions.class); - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/entity/SimpleEntity.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/entity/SimpleEntity.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/entity/SimpleEntity.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,39 +0,0 @@ -package org.jboss.seam.test.unit.entity; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * A simple entity class that can be used in tests. - */ -@Entity -public class SimpleEntity implements Serializable -{ - private Long id; - - private String name; - - @Id @GeneratedValue - public Long getId() - { - return id; - } - - public String getName() - { - return name; - } - - public void setId(Long id) - { - this.id = id; - } - - public void setName(String name) - { - this.name = name; - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/testng.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/testng.xml 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/testng.xml 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,78 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="Seam Unit Testsuite" verbose="2" parallel="false"> - <test name="Seam Unit Tests Core"> - <classes> - <class name="org.jboss.seam.test.unit.CoreTest"/> - <class name="org.jboss.seam.test.unit.InitializationTest"/> - <class name="org.jboss.seam.test.unit.InterceptorTest"/> - <class name="org.jboss.seam.test.unit.ComponentTest"/> - <class name="org.jboss.seam.test.unit.ContextTest"/> - <class name="org.jboss.seam.test.unit.DependencyTest"/> - <class name="org.jboss.seam.test.unit.ExpressionsTest"/> - </classes> - </test> - - <test name="Seam Unit Tests Mail"> - <classes> - <class name="org.jboss.seam.test.unit.MailTest"/> - </classes> - </test> - - <test name="Seam Unit Tests BPM and Pageflow"> - <classes> - <class name="org.jboss.seam.test.unit.bpm.ActorTest" /> - <class name="org.jboss.seam.test.unit.bpm.TaskListTest" /> - <class name="org.jboss.seam.test.unit.PageflowTest"/> - <class name="org.jboss.seam.test.unit.bpm.JbpmTest"/> - </classes> - </test> - - <test name="Seam Unit Tests Pages dot xml"> - <classes> - <class name="org.jboss.seam.test.unit.PageActionsTest" /> - <class name="org.jboss.seam.test.unit.PageDescriptorTest" /> - <class name="org.jboss.seam.test.unit.PageParamTest" /> - </classes> - </test> - - <test name="Seam Unit Tests JSF integration"> - <classes> - <class name="org.jboss.seam.test.unit.PhaseListenerTest"/> - </classes> - </test> - - <test name="Seam Unit Tests Password Hash"> - <classes> - <class name="org.jboss.seam.test.unit.PasswordHashTest"/> - </classes> - </test> - - <test name="Seam Unit Tests Framework"> - <classes> - <class name="org.jboss.seam.test.unit.HomeTest" /> - <class name="org.jboss.seam.test.unit.QueryTest" /> - </classes> - </test> - - <test name="Seam Unit Tests Filters"> - <classes> - <class name="org.jboss.seam.test.unit.web.MultipartRequestTest" /> - <class name="org.jboss.seam.test.unit.web.IdentityRequestWrapperTest" /> - </classes> - </test> - - <test name="Seam Unit Tests Resources and i8ln"> - <classes> - <class name="org.jboss.seam.test.unit.InterpolatorTest"/> - <class name="org.jboss.seam.test.unit.web.ConditionalRequestTest" /> - </classes> - </test> - - <test name="Seam Unit Tests URL Rewrite"> - <classes> - <class name="org.jboss.seam.test.unit.web.RewriteTest" /> - </classes> - </test> - -</suite> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/ConditionalRequestTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,229 +0,0 @@ -package org.jboss.seam.test.unit.web; - -import static org.testng.Assert.assertEquals; - -import java.io.IOException; -import java.util.Date; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.jboss.seam.mock.EnhancedMockHttpServletRequest; -import org.jboss.seam.mock.EnhancedMockHttpServletResponse; -import org.jboss.seam.mock.MockHttpSession; -import org.jboss.seam.web.ConditionalAbstractResource; -import org.testng.annotations.Test; - -/** - * @author Christian Bauer - * - */ -public class ConditionalRequestTest -{ - @Test - public void testNotModifiedOnlyETag() throws Exception - { - - HttpSession session = new MockHttpSession(); - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(session); - EnhancedMockHttpServletResponse response = new EnhancedMockHttpServletResponse(); - - request.addHeader(ConditionalAbstractResource.HEADER_IF_NONE_MATCH, "\"1234\", \"5678\""); - - ConditionalAbstractResource resource = new ConditionalAbstractResource() - { - public void getResource(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - if (!sendConditional(request, response, "\"5678\"", null)) - { - response.sendError(HttpServletResponse.SC_OK); - } - } - - public String getResourcePath() - { - return null; - } - }; - - resource.getResource(request, response); - - assertEquals(response.getStatus(), HttpServletResponse.SC_NOT_MODIFIED); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_ETAG), "\"5678\""); - - } - - @Test - public void testModifiedOnlyETag() throws Exception - { - - HttpSession session = new MockHttpSession(); - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(session); - EnhancedMockHttpServletResponse response = new EnhancedMockHttpServletResponse(); - - request.addHeader(ConditionalAbstractResource.HEADER_IF_NONE_MATCH, "\"123\", \"456\""); - - ConditionalAbstractResource resource = new ConditionalAbstractResource() - { - public void getResource(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - if (!sendConditional(request, response, "\"5678\"", null)) - { - response.sendError(HttpServletResponse.SC_OK); - } - } - - public String getResourcePath() - { - return null; - } - }; - - resource.getResource(request, response); - - assertEquals(response.getStatus(), HttpServletResponse.SC_OK); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_ETAG), "\"5678\""); - } - - @Test - public void testNotModifiedOnlyLastModified() throws Exception - { - - HttpSession session = new MockHttpSession(); - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(session); - EnhancedMockHttpServletResponse response = new EnhancedMockHttpServletResponse(); - - final Long currentTime = new Date().getTime(); - request.addHeader(ConditionalAbstractResource.HEADER_IF_MODIFIED_SINCE, currentTime); - - ConditionalAbstractResource resource = new ConditionalAbstractResource() - { - public void getResource(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - if (!sendConditional(request, response, null, currentTime)) - { - response.sendError(HttpServletResponse.SC_OK); - } - } - - public String getResourcePath() - { - return null; - } - }; - - resource.getResource(request, response); - - assertEquals(response.getStatus(), HttpServletResponse.SC_NOT_MODIFIED); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime); - - } - - @Test - public void testModifiedOnlyLastModified() throws Exception - { - - HttpSession session = new MockHttpSession(); - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(session); - EnhancedMockHttpServletResponse response = new EnhancedMockHttpServletResponse(); - - final Long currentTime = new Date().getTime(); - request.addHeader(ConditionalAbstractResource.HEADER_IF_MODIFIED_SINCE, currentTime); - - ConditionalAbstractResource resource = new ConditionalAbstractResource() - { - public void getResource(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - if (!sendConditional(request, response, null, currentTime + 5000)) - { - response.sendError(HttpServletResponse.SC_OK); - } - } - - public String getResourcePath() - { - return null; - } - }; - - resource.getResource(request, response); - - assertEquals(response.getStatus(), HttpServletResponse.SC_OK); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime + 5000); - - } - - @Test - public void testNotModifiedETagLastModified() throws Exception - { - - HttpSession session = new MockHttpSession(); - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(session); - EnhancedMockHttpServletResponse response = new EnhancedMockHttpServletResponse(); - - final Long currentTime = new Date().getTime(); - request.addHeader(ConditionalAbstractResource.HEADER_IF_MODIFIED_SINCE, currentTime); - request.addHeader(ConditionalAbstractResource.HEADER_IF_NONE_MATCH, "\"1234\", \"5678\""); - - ConditionalAbstractResource resource = new ConditionalAbstractResource() - { - public void getResource(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - if (!sendConditional(request, response, "\"5678\"", currentTime)) - { - response.sendError(HttpServletResponse.SC_OK); - } - } - - public String getResourcePath() - { - return null; - } - }; - - resource.getResource(request, response); - - assertEquals(response.getStatus(), HttpServletResponse.SC_NOT_MODIFIED); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_ETAG), "\"5678\""); - - } - - @Test - public void testModifiedETagLastModified() throws Exception - { - - HttpSession session = new MockHttpSession(); - EnhancedMockHttpServletRequest request = new EnhancedMockHttpServletRequest(session); - EnhancedMockHttpServletResponse response = new EnhancedMockHttpServletResponse(); - - final Long currentTime = new Date().getTime(); - request.addHeader(ConditionalAbstractResource.HEADER_IF_MODIFIED_SINCE, currentTime); - request.addHeader(ConditionalAbstractResource.HEADER_IF_NONE_MATCH, "\"1234\", \"5678\""); - - ConditionalAbstractResource resource = new ConditionalAbstractResource() - { - public void getResource(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - if (!sendConditional(request, response, "\"5678\"", currentTime + 5000)) - { - response.sendError(HttpServletResponse.SC_OK); - } - } - - public String getResourcePath() - { - return null; - } - }; - - resource.getResource(request, response); - - assertEquals(response.getStatus(), HttpServletResponse.SC_OK); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_LAST_MODIFIED), currentTime + 5000); - assertEquals(response.getHeader(ConditionalAbstractResource.HEADER_ETAG), "\"5678\""); - - } -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/IdentityRequestWrapperTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/IdentityRequestWrapperTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/IdentityRequestWrapperTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,73 +0,0 @@ -package org.jboss.seam.test.unit.web; - -import java.security.Principal; -import java.util.Arrays; -import java.util.HashSet; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import org.jboss.seam.Seam; -import org.jboss.seam.mock.MockHttpServletRequest; -import org.jboss.seam.mock.MockHttpSession; -import org.jboss.seam.security.Identity; -import org.jboss.seam.security.SimplePrincipal; -import org.jboss.seam.web.IdentityRequestWrapper; -import org.testng.annotations.Test; - -public class IdentityRequestWrapperTest -{ - private static final String JAAS_USER = "jaasUser"; - - private static final String JAAS_ROLE = "jaasRole"; - - private static final String SEAM_USER = "seamUser"; - - private static final String SEAM_ROLE = "seamRole"; - - @Test - public void testWithSeamSecurityEnabled() - { - HttpServletRequest request = initializeWrappedRequest(); - if (!Identity.isSecurityEnabled()) - { - Identity.setSecurityEnabled(true); - } - assert request.getUserPrincipal() != null && request.getUserPrincipal().getName().equals(SEAM_USER); - assert request.getRemoteUser() != null && request.getRemoteUser().equals(SEAM_USER); - assert request.isUserInRole(SEAM_ROLE); - } - - @Test - public void testWithSeamSecurityDisabled() - { - HttpServletRequest request = initializeWrappedRequest(); - Identity.setSecurityEnabled(false); - assert request.getUserPrincipal() != null && request.getUserPrincipal().getName().equals(JAAS_USER); - assert request.getRemoteUser() != null && request.getRemoteUser().equals(JAAS_USER); - assert request.isUserInRole(JAAS_ROLE); - } - - public HttpServletRequest initializeWrappedRequest() { - HttpSession session = new MockHttpSession(); - Identity identity = new Identity() { - - @Override - public Principal getPrincipal() - { - return new SimplePrincipal(SEAM_USER); - } - - @Override - public boolean hasRole(String role) - { - return SEAM_ROLE.equals(role); - } - - }; - session.setAttribute(Seam.getComponentName(Identity.class), identity); - HttpServletRequest request = new MockHttpServletRequest(session, JAAS_USER, new HashSet<String>(Arrays.asList(JAAS_ROLE)), null, "GET"); - return new IdentityRequestWrapper(request); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/MultipartRequestTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,94 +0,0 @@ -package org.jboss.seam.test.unit.web; - -import java.io.IOException; -import java.io.InputStream; -import java.util.HashSet; - -import javax.servlet.FilterChain; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpSession; - -import org.jboss.seam.mock.MockHttpServletRequest; -import org.jboss.seam.mock.MockHttpServletResponse; -import org.jboss.seam.mock.MockHttpSession; -import org.jboss.seam.mock.MockServletContext; -import org.jboss.seam.util.Resources; -import org.jboss.seam.web.MultipartFilter; -import org.jboss.seam.web.MultipartRequest; -import org.testng.annotations.Test; - -/** - * @author Pete Muir - * - */ -public class MultipartRequestTest -{ - - @Test - public void testMultipartRequest() throws IOException, ServletException - { - MultipartFilter filter = new MultipartFilter(); - ServletContext context = new MockServletContext(); - HttpSession session = new MockHttpSession(context); - MockHttpServletRequest request = new MockHttpServletRequest(session, "Pete", new HashSet<String>(), new Cookie[0], "post") - { - - private final InputStream is = Resources.getResourceAsStream("/META-INF/seam.properties", null); - - @Override - public String getContentType() - { - return "multipart/test; boundary=foo"; - } - - @Override - public ServletInputStream getInputStream() throws IOException - { - return new ServletInputStream() { - - @Override - public int read() throws IOException - { - return is.read(); - } - - @Override - public int read(byte[] b) throws IOException - { - return is.read(b); - } - - }; - } - - }; - // Add some parameters to test passthrough - String [] fooParams = {"bar"}; - request.getParameterMap().put("foo", fooParams); - ServletResponse response = new MockHttpServletResponse(); - FilterChain chain = new FilterChain() - { - - public void doFilter(ServletRequest request, ServletResponse response) - throws IOException, ServletException - { - assert request instanceof MultipartRequest; - MultipartRequest multipartRequest = (MultipartRequest) request; - assert multipartRequest.getParameterMap().containsKey("foo"); - // Test passthrough parameters - assert multipartRequest.getParameterValues("foo").length == 1; - assert "bar".equals(multipartRequest.getParameterValues("foo")[0]); - - // TODO Test a multipart request - } - - }; - filter.doFilter(request, response, chain); - } - -} Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/RewriteTest.java =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/RewriteTest.java 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/java/org/jboss/seam/test/unit/web/RewriteTest.java 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,135 +0,0 @@ -package org.jboss.seam.test.unit.web; - -import org.testng.annotations.Test; - -import org.jboss.seam.web.Pattern; -import org.jboss.seam.web.Rewrite; -import org.jboss.seam.web.ServletMapping; - -import static org.testng.Assert.*; - -public class RewriteTest -{ - @Test - public void testBasicInPattern() - throws Exception - { - Pattern pattern = new Pattern("/foo.seam", "/foo"); - pattern.setViewMapping(new ServletMapping("*.seam")); - - testNoMatchIn(pattern, "/bar"); - testNoMatchIn(pattern, "/fool"); - testNoMatchIn(pattern, "/foo.seam"); - testNoMatchIn(pattern, "/foo/"); - testNoMatchIn(pattern, "/foo/bar"); - - testMatchIn(pattern, "/foo", "/foo.seam"); - testMatchIn(pattern, "/foo?x=y", "/foo.seam?x=y"); - } - - @Test - public void testSingleArgInPattern() - throws Exception - { - Pattern pattern = new Pattern("/foo.seam", "/foo/{id}"); - pattern.setViewMapping(new ServletMapping("*.seam")); - - testNoMatchIn(pattern, "/foo"); - testNoMatchIn(pattern, "/foo/bar/baz"); - testNoMatchIn(pattern, "/foo/bar/baz?x=y"); - testNoMatchIn(pattern, "/foo/bar/?x=y"); - - testMatchIn(pattern, "/foo/", "/foo.seam?id="); - testMatchIn(pattern, "/foo/bar", "/foo.seam?id=bar"); - testMatchIn(pattern, "/foo/bar?x=y", "/foo.seam?x=y&id=bar"); - } - - @Test - public void testMultiArgInPattern() - throws Exception - { - Pattern pattern = new Pattern("/foo.seam", "/foo/{id}/{action}"); - pattern.setViewMapping(new ServletMapping("*.seam")); - - testNoMatchIn(pattern, "/foo"); - testNoMatchIn(pattern, "/foo/bar"); - testNoMatchIn(pattern, "/foo/bar/baz/qux"); - - testMatchIn(pattern, "/foo/bar/baz", "/foo.seam?id=bar&action=baz"); - testMatchIn(pattern, "/foo/bar/baz?x=y", "/foo.seam?x=y&id=bar&action=baz"); - } - - - @Test - public void testBasicOutPattern() - throws Exception - { - Pattern pattern = new Pattern("/foo.seam", "/foo"); - pattern.setViewMapping(new ServletMapping("*.seam")); - - testNoMatchOut(pattern, "/bar.seam"); - testNoMatchOut(pattern, "/fool.seam"); - testNoMatchOut(pattern, "/foo"); - - testMatchOut(pattern, "/foo.seam", "/foo"); - testMatchOut(pattern, "/foo.seam?x=y", "/foo?x=y"); - } - - - @Test - public void testSingleArgOutPattern() - throws Exception - { - Pattern pattern = new Pattern("/foo.seam", "/foo/{id}"); - pattern.setViewMapping(new ServletMapping("*.seam")); - - testNoMatchOut(pattern, "/foo.seam"); - testNoMatchOut(pattern, "/foo.seam?x=y"); - testNoMatchOut(pattern, "/foo.seam/bar"); - //should this match? - //testNoMatchOut(pattern, "/foo.seam/bar?id=test"); - - testMatchOut(pattern, "/foo.seam?id=bar", "/foo/bar"); - testMatchOut(pattern, "/foo.seam?x=y&id=bar", "/foo/bar?x=y"); - testMatchOut(pattern, "/foo.seam?id=bar&x=y", "/foo/bar?x=y"); - testMatchOut(pattern, "/foo.seam?a=b&x=y&id=bar&c=d&c=e", "/foo/bar?a=b&x=y&c=d&c=e"); - } - - @Test - public void testMultiArgOutPattern() - throws Exception - { - Pattern pattern = new Pattern("/foo.seam", "/foo/{id}/{action}"); - pattern.setViewMapping(new ServletMapping("*.seam")); - - testNoMatchOut(pattern, "/foo.seam"); - testNoMatchOut(pattern, "/foo.seam?id=bar"); - testNoMatchOut(pattern, "/foo.seam?action=baz"); - - testMatchOut(pattern, "/foo.seam?action=baz&id=bar", "/foo/bar/baz"); - testMatchOut(pattern, "/foo.seam?y=z&action=baz&n=one&n=two&id=bar&x=y", "/foo/bar/baz?y=z&n=one&n=two&x=y"); - } - - - public void testNoMatchIn(Pattern pattern, String incoming) { - assertNull(pattern.matchIncoming(incoming), incoming); - } - - public void testNoMatchOut(Pattern pattern, String incoming) { - assertNull(pattern.matchOutgoing(incoming), incoming); - } - - public void testMatchIn(Pattern pattern, String incoming, String expected) { - Rewrite rewrite = pattern.matchIncoming(incoming); - assertTrue(rewrite.isMatch(), incoming); - assertEquals(rewrite.rewrite(), expected); - } - - public void testMatchOut(Pattern pattern, String incoming, String expected) { - Rewrite rewrite = pattern.matchOutgoing(incoming); - assertTrue(rewrite.isMatch(), incoming); - assertEquals(rewrite.rewrite(), expected); - } - -} - Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/META-INF/pagesForPageActionsTest.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/META-INF/pagesForPageActionsTest.xml 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/META-INF/pagesForPageActionsTest.xml 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages - http://jboss.com/products/seam/pages-2.3.xsd"> - - <page view-id="/action-test01a.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - </page> - - <page view-id="/action-test01b.xhtml" action="#{testActions.nonNullActionA}"> - <description>#{fineDescription}</description> - <action execute="#{testActions.nonNullActionB}" /> - </page> - - <page view-id="/action-test01*"> - <description>coarse-description</description> - <navigation from-action="#{testActions.nonNullActionA}"> - <rule if-outcome="outcomeA"> - <render view-id="/pageA.xhtml" /> - </rule> - </navigation> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test02.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - <action execute="#{testActions.nonNullActionC}" /> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test03.xhtml"> - <action execute="#{testActions.nullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - - <navigation from-action="#{testActions.nullActionA}"> - <render view-id="/pageA.xhtml"/> - </navigation> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test04.xhtml"> - <action execute="#{testActions.nullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - <action execute="#{testActions.nonNullActionC}" /> - - <navigation> - <rule> - <render view-id="/action-test04.xhtml"/> - </rule> - </navigation> - </page> - - <page view-id="/action-test05.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - - <navigation from-action="#{testActions.nonNullActionA}"> - <rule if-outcome="outcomeA"> - <redirect view-id="/pageA.xhtml" /> - </rule> - </navigation> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <redirect view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test06.xhtml"> - <action execute="#{testActions.nonNullActionA}"/> - <action execute="#{testActions.nonNullActionB}" on-postback="false"/> - </page> - -  - <page view-id="/action-test99a.xhtml"> - <action execute="#{testActions.nonNullActionA}" /> - <action execute="#{testActions.nonNullActionB}" /> - - <navigation from-action="#{testActions.nonNullActionA}"> - <rule if-outcome="outcomeA"> - <render view-id="/action-test99b.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/action-test99b.xhtml"> - <action execute="#{testActions.nonNullActionC}" /> - - <navigation from-action="#{testActions.nonNullActionB}"> - <rule if-outcome="outcomeB"> - <render view-id="/pageB.xhtml" /> - </rule> - </navigation> - </page> - - <page view-id="/end-conversation-test.xhtml"> - <end-conversation /> - </page> - - <page view-id="/end-root-conversation-test.xhtml"> - <end-conversation root="true" /> - </page> - -</pages> Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/META-INF/seam.properties =================================================================== Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/SeamTextTest.txt =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/SeamTextTest.txt 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/SeamTextTest.txt 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,104 +0,0 @@ -+Seam Text! -This page demonstrates Seam Text. - -++Some examples: - -Here is some wiki text: -*bold* |mono| ~deleted~ _underline_ /italic/ ^super^ - -This is a new paragraph. (Just leave a blank line.) - -*/_Multiple ~tags~ styles_ can be nested!/* - -Special characters can be escaped: \| \* \_ - -This is especially useful for HTML: \<notatag\> \&notanentity; - -But if we don't want to use escapes in our preformatted -text, we can wrap it in backwards quotes, and special -characters get escaped automagically: - -`//This is some code: - -<some-tag/> -"a string" -a_variable_name -a||b -x=y*z/2` - -We wrap quoted text in double quotes: - -"This is a block quote with /formatting/. The quote can cross multiple -lines, but a blank line does not start a new paragraph. If you -need multiple paragraphs in a quote, you have to use \<p\>." - -You can even have "a quote", or `some code` inside -a regular paragraph! - -We use ordinary old HTML for tables: - -<table> - <tr><td>foo</td><td>*bar*</td><td>baz</td></tr><tr> - <td>fee</td> - <td>fi</td> - <td>/fo/</td> - </tr> -</table> - -And we can use HTML for lists: - -<ol> - <li>foo</li> - <li>*bar*</li> - <li>/baz/</li> -</ol> - -<ul><li>foo</li><li>*bar*</li><li>/baz/</li></ul> - -But if the items fit on a line, we can use \# -for ordered lists: - -# item 1 -# item 2 -# item 3 - -And \= for unordered lists: - -= item 1 -= item 2 -= item 3 - -We use HTML for <a href="http://www.hibernate.org/">links</a>. - -Or we can use [a special syntax=>http://jboss.com/products/seam] to -link to [=>http://jboss.com/products/seam]. - -And for images: <img src="http://www.hibernate.org/tpl/jboss/img/01_oben_logo.gif"/> - -And even for more exotic formatting, for example: - -<q>This is a /HTML/ quote with a <a href="http://jboss.org/">link</a>, -and a "nested quote" and even `some code` in it.</q> - -<p> -This is a HTML paragraph with some lists: - -# item 1 -# item 2 - -= an item -= another item - -And "a quote" in it. -</p> - -Oh, and one last thing: - -"This is a block quote with - -= a list, -= with 2 items - -and <i>some HTML</i> formatting and `some code` and -and <a href="http://jboss.com/products/seam"><i>yet -another</i> link</a>." Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/ConfigurableComponent.component.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/ConfigurableComponent.component.xml 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/ConfigurableComponent.component.xml 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<component> - <property name="primaryColor">RED</property> -</component> \ No newline at end of file Deleted: branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/MyEntityHome.component.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/MyEntityHome.component.xml 2012-03-14 17:27:54 UTC (rev 14387) +++ branches/community/Seam_2_3/jboss-seam-jsf2/src/test/resources/org/jboss/seam/test/unit/component/MyEntityHome.component.xml 2012-03-14 17:34:37 UTC (rev 14388) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.com/products/seam/components" - xmlns:framework="http://jboss.com/products/seam/framework" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd - http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd"> - -  - <framework:entity-home name="myEntityHome" class="org.jboss.seam.test.unit.component.MyEntityHome"> - <framework:id>1#{1}</framework:id> - <framework:new-instance>#{simpleEntity}</framework:new-instance> - <framework:created-message>You #{'created'} it! Yeah!</framework:created-message> - <framework:updated-message>You updated it! Yeah!</framework:updated-message> - <framework:deleted-message>You deleted it! Yeah!</framework:deleted-message> - </framework:entity-home> - - <component name="simpleEntity" class="org.jboss.seam.test.unit.entity.SimpleEntity"/> - -</components>

14 years

1
0
0 / 0

Seam SVN: r14387 - in branches/community/Seam_2_3: examples and 216 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:27:54 -0400 (Wed, 14 Mar 2012) New Revision: 14387 Modified: branches/community/Seam_2_3/distribution/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml branches/community/Seam_2_3/examples-ee6/booking/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml branches/community/Seam_2_3/examples-ee6/mail/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml branches/community/Seam_2_3/examples-ee6/messages/pom.xml branches/community/Seam_2_3/examples-ee6/pom.xml branches/community/Seam_2_3/examples/blog/blog-ear/pom.xml branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml branches/community/Seam_2_3/examples/blog/blog-web/pom.xml branches/community/Seam_2_3/examples/blog/pom.xml branches/community/Seam_2_3/examples/booking/booking-ear/pom.xml branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples/booking/booking-web/pom.xml branches/community/Seam_2_3/examples/booking/pom.xml branches/community/Seam_2_3/examples/contactlist/contactlist-ear/pom.xml branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml branches/community/Seam_2_3/examples/contactlist/contactlist-web/pom.xml branches/community/Seam_2_3/examples/contactlist/pom.xml branches/community/Seam_2_3/examples/drools/drools-ear/pom.xml branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml branches/community/Seam_2_3/examples/drools/drools-web/pom.xml branches/community/Seam_2_3/examples/drools/pom.xml branches/community/Seam_2_3/examples/dvdstore/dvdstore-ear/pom.xml branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml branches/community/Seam_2_3/examples/dvdstore/pom.xml branches/community/Seam_2_3/examples/excel/excel-ear/pom.xml branches/community/Seam_2_3/examples/excel/excel-ejb/pom.xml branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml branches/community/Seam_2_3/examples/excel/excel-web/pom.xml branches/community/Seam_2_3/examples/excel/pom.xml branches/community/Seam_2_3/examples/groovybooking/groovybooking-tests/pom.xml branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/pom.xml branches/community/Seam_2_3/examples/groovybooking/pom.xml branches/community/Seam_2_3/examples/guice/guice-ear/pom.xml branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml branches/community/Seam_2_3/examples/guice/guice-web/pom.xml branches/community/Seam_2_3/examples/guice/pom.xml branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml branches/community/Seam_2_3/examples/hibernate/hibernate-web/pom.xml branches/community/Seam_2_3/examples/hibernate/pom.xml branches/community/Seam_2_3/examples/icefaces/icefaces-ear/pom.xml branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml branches/community/Seam_2_3/examples/icefaces/pom.xml branches/community/Seam_2_3/examples/itext/itext-ear/pom.xml branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml branches/community/Seam_2_3/examples/itext/itext-web/pom.xml branches/community/Seam_2_3/examples/itext/pom.xml branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml branches/community/Seam_2_3/examples/jee5/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples/jee5/booking/booking-web/pom.xml branches/community/Seam_2_3/examples/jee5/booking/pom.xml branches/community/Seam_2_3/examples/jee5/remoting/pom.xml branches/community/Seam_2_3/examples/jee5/remoting/remoting-ear/pom.xml branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml branches/community/Seam_2_3/examples/jee5/remoting/remoting-web/pom.xml branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml branches/community/Seam_2_3/examples/jpa/jpa-web/pom.xml branches/community/Seam_2_3/examples/jpa/pom.xml branches/community/Seam_2_3/examples/mail/mail-ear/pom.xml branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml branches/community/Seam_2_3/examples/mail/mail-web/pom.xml branches/community/Seam_2_3/examples/mail/pom.xml branches/community/Seam_2_3/examples/messages/messages-ear/pom.xml branches/community/Seam_2_3/examples/messages/messages-ejb/pom.xml branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml branches/community/Seam_2_3/examples/messages/messages-web/pom.xml branches/community/Seam_2_3/examples/messages/pom.xml branches/community/Seam_2_3/examples/metawidget/booking/booking-ear/pom.xml branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml branches/community/Seam_2_3/examples/metawidget/booking/booking-web/pom.xml branches/community/Seam_2_3/examples/metawidget/booking/pom.xml branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ear/pom.xml branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-web/pom.xml branches/community/Seam_2_3/examples/metawidget/dvdstore/pom.xml branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-tests/pom.xml branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-web/pom.xml branches/community/Seam_2_3/examples/metawidget/groovybooking/pom.xml branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ear/pom.xml branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-web/pom.xml branches/community/Seam_2_3/examples/nestedbooking/pom.xml branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml branches/community/Seam_2_3/examples/numberguess/pom.xml branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml branches/community/Seam_2_3/examples/openid/openid-tests/pom.xml branches/community/Seam_2_3/examples/openid/openid-web/pom.xml branches/community/Seam_2_3/examples/openid/pom.xml branches/community/Seam_2_3/examples/pom.xml branches/community/Seam_2_3/examples/quartz/pom.xml branches/community/Seam_2_3/examples/quartz/quartz-ear/pom.xml branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml branches/community/Seam_2_3/examples/registration/pom.xml branches/community/Seam_2_3/examples/registration/registration-ear/pom.xml branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml branches/community/Seam_2_3/examples/registration/registration-web/pom.xml branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ear/pom.xml branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-tests/pom.xml branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml branches/community/Seam_2_3/examples/remoting/chatroom/pom.xml branches/community/Seam_2_3/examples/remoting/gwt/gwt-ear/pom.xml branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml branches/community/Seam_2_3/examples/remoting/gwt/gwt-tests/pom.xml branches/community/Seam_2_3/examples/remoting/gwt/gwt-web/pom.xml branches/community/Seam_2_3/examples/remoting/gwt/pom.xml branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ear/pom.xml branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-tests/pom.xml branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-web/pom.xml branches/community/Seam_2_3/examples/remoting/helloworld/pom.xml branches/community/Seam_2_3/examples/remoting/progressbar/pom.xml branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ear/pom.xml branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-web/pom.xml branches/community/Seam_2_3/examples/restbay/pom.xml branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml branches/community/Seam_2_3/examples/restbay/restbay-web/pom.xml branches/community/Seam_2_3/examples/rss/pom.xml branches/community/Seam_2_3/examples/rss/rss-ear/pom.xml branches/community/Seam_2_3/examples/rss/rss-ejb/pom.xml branches/community/Seam_2_3/examples/rss/rss-tests/pom.xml branches/community/Seam_2_3/examples/rss/rss-web/pom.xml branches/community/Seam_2_3/examples/seambay/pom.xml branches/community/Seam_2_3/examples/seambay/seambay-ear/pom.xml branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml branches/community/Seam_2_3/examples/seambay/seambay-web/pom.xml branches/community/Seam_2_3/examples/seamdiscs/pom.xml branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ear/pom.xml branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/pom.xml branches/community/Seam_2_3/examples/seampay/pom.xml branches/community/Seam_2_3/examples/seampay/seampay-ear/pom.xml branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml branches/community/Seam_2_3/examples/seampay/seampay-web/pom.xml branches/community/Seam_2_3/examples/seamspace/pom.xml branches/community/Seam_2_3/examples/seamspace/seamspace-ear/pom.xml branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml branches/community/Seam_2_3/examples/seamspace/seamspace-web/pom.xml branches/community/Seam_2_3/examples/spring/pom.xml branches/community/Seam_2_3/examples/spring/spring-tests/pom.xml branches/community/Seam_2_3/examples/spring/spring-web/pom.xml branches/community/Seam_2_3/examples/tasks/pom.xml branches/community/Seam_2_3/examples/tasks/tasks-ear/pom.xml branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml branches/community/Seam_2_3/examples/todo/pom.xml branches/community/Seam_2_3/examples/todo/todo-ear/pom.xml branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml branches/community/Seam_2_3/examples/todo/todo-web/pom.xml branches/community/Seam_2_3/examples/ui/pom.xml branches/community/Seam_2_3/examples/ui/ui-ear/pom.xml branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml branches/community/Seam_2_3/examples/ui/ui-tests/pom.xml branches/community/Seam_2_3/examples/ui/ui-web/pom.xml branches/community/Seam_2_3/functional-tests/pom.xml branches/community/Seam_2_3/jboss-embedded-bootstrap/pom.xml branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml branches/community/Seam_2_3/jboss-seam-debug/pom.xml branches/community/Seam_2_3/jboss-seam-excel/pom.xml branches/community/Seam_2_3/jboss-seam-flex/pom.xml branches/community/Seam_2_3/jboss-seam-gen/pom.xml branches/community/Seam_2_3/jboss-seam-ioc/pom.xml branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml branches/community/Seam_2_3/jboss-seam-jul/pom.xml branches/community/Seam_2_3/jboss-seam-mail/pom.xml branches/community/Seam_2_3/jboss-seam-parent/pom.xml branches/community/Seam_2_3/jboss-seam-pdf/pom.xml branches/community/Seam_2_3/jboss-seam-remoting/pom.xml branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml branches/community/Seam_2_3/jboss-seam-rss/pom.xml branches/community/Seam_2_3/jboss-seam-ui-jsf2/pom.xml branches/community/Seam_2_3/jboss-seam-ui/pom.xml branches/community/Seam_2_3/jboss-seam-wicket/pom.xml branches/community/Seam_2_3/jboss-seam/pom.xml branches/community/Seam_2_3/seam-integration-tests/pom.xml branches/community/Seam_2_3/seam-reference-guide/pom.xml Log: changed version to 2.3.0.Beta1-SNAPSHOT Modified: branches/community/Seam_2_3/distribution/pom.xml =================================================================== --- branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/blog/blog-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/blog/blog-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>blog</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/blog/blog-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>blog</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/blog/blog-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>blog</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/blog/blog-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/blog-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/blog/blog-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>blog</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/blog/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/blog/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/blog/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/booking/booking-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/booking/booking-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/booking/booking-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/booking/booking-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/booking/booking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/booking/booking-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/booking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/booking/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/booking/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Booking Example</name> Modified: branches/community/Seam_2_3/examples/contactlist/contactlist-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/contactlist/contactlist-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/contactlist/contactlist-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>contactlist</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/contactlist/contactlist-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>contactlist</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/contactlist/contactlist-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>contactlist</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/contactlist/contactlist-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/contactlist/contactlist-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/contactlist/contactlist-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>contactlist</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/contactlist/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/contactlist/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/contactlist/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/drools/drools-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/drools/drools-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/drools/drools-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/drools/drools-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/drools/drools-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/drools/drools-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/drools/drools-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/drools/drools-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>drools</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/drools/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/drools/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/drools/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/dvdstore/dvdstore-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/dvdstore/dvdstore-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/dvdstore/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/dvdstore/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/dvdstore/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/excel/excel-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/excel/excel-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/excel/excel-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/excel/excel-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/excel/excel-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/excel/excel-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/excel/excel-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/excel/excel-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/excel/excel-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/excel/excel-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>excel</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/excel/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/excel/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/excel/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/groovybooking/groovybooking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/groovybooking/groovybooking-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/groovybooking/groovybooking-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>groovybooking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/groovybooking/groovybooking-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>groovybooking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/groovybooking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/groovybooking/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/groovybooking/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Groovy Booking Example</name> Modified: branches/community/Seam_2_3/examples/guice/guice-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/guice/guice-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/guice/guice-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/guice/guice-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/guice/guice-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/guice/guice-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/guice/guice-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/guice/guice-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>guice</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/guice/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/guice/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/guice/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/hibernate/hibernate-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>hibernate</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/hibernate/hibernate-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/hibernate/hibernate-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/hibernate/hibernate-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>hibernate</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/hibernate/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/hibernate/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/hibernate/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Hibernate Example</name> Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>icefaces</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>icefaces</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>icefaces</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/icefaces/icefaces-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>icefaces</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/icefaces/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/icefaces/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/icefaces/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/itext/itext-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/itext/itext-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/itext/itext-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>itext</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/itext/itext-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>itext</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/itext/itext-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>itext</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/itext/itext-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/itext/itext-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/itext/itext-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>itext</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/itext/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/itext/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/itext/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/booking/booking-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.jee5</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/booking/booking-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.jee5</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jee5/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/booking/booking-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/booking/booking-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.jee5</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jee5/booking/booking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/booking/booking-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/booking/booking-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.jee5</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jee5/booking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/booking/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/booking/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: branches/community/Seam_2_3/examples/jee5/remoting/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/remoting/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/remoting/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jee5/remoting/remoting-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/remoting/remoting-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/remoting/remoting-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>remoting</artifactId> <groupId>org.jboss.seam.examples.jee5</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/remoting/remoting-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>remoting</artifactId> <groupId>org.jboss.seam.examples.jee5</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jee5/remoting/remoting-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jee5/remoting/remoting-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jee5/remoting/remoting-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>remoting</artifactId> <groupId>org.jboss.seam.examples.jee5</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jpa/jpa-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>jpa</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jpa/jpa-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jpa/jpa-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jpa/jpa-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>jpa</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/jpa/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/jpa/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/jpa/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>JPA Example</name> Modified: branches/community/Seam_2_3/examples/mail/mail-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/mail/mail-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/mail/mail-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/mail/mail-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/mail/mail-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/mail/mail-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/mail/mail-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/mail/mail-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/mail/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/mail/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/mail/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Seam Mail Example</name> Modified: branches/community/Seam_2_3/examples/messages/messages-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/messages/messages-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/messages/messages-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/messages/messages-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/messages/messages-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/messages/messages-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/messages/messages-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/messages/messages-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/messages/messages-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/messages/messages-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/messages/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/messages/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/messages/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/metawidget/booking/booking-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/booking/booking-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/booking/booking-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/booking/booking-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/booking/booking-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/booking/booking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/booking/booking-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/booking/booking-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/booking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/booking/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/booking/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/dvdstore/dvdstore-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>dvdstore</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/dvdstore/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/dvdstore/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/dvdstore/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>groovybooking</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/groovybooking/groovybooking-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>groovybooking</artifactId> <groupId>org.jboss.seam.examples.metawidget</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/metawidget/groovybooking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/metawidget/groovybooking/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/metawidget/groovybooking/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>nestedbooking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>nestedbooking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>nestedbooking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/nestedbooking/nestedbooking-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>nestedbooking</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/nestedbooking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/nestedbooking/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/nestedbooking/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Nested Booking Example</name> Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/numberguess/numberguess-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>numberguess</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/numberguess/numberguess-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>numberguess</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/numberguess/numberguess-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>numberguess</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/numberguess/numberguess-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>numberguess</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/numberguess/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/numberguess/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/numberguess/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Numberguess Example</name> Modified: branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/openid/openid-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>openid</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/openid/openid-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>openid</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/openid/openid-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/openid/openid-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/openid/openid-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>openid</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/openid/openid-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/openid/openid-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/openid/openid-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>openid</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/openid/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/openid/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/openid/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/quartz/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/quartz/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/quartz/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Quartz Example</name> Modified: branches/community/Seam_2_3/examples/quartz/quartz-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/quartz/quartz-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/quartz/quartz-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>quartz</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/quartz/quartz-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>quartz</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/quartz/quartz-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>quartz</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/quartz/quartz-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>quartz</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/registration/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/registration/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/registration/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/registration/registration-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/registration/registration-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/registration/registration-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>registration</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/registration/registration-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>registration</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/registration/registration-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>registration</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/registration/registration-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/registration/registration-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/registration/registration-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>registration</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>chatroom</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>chatroom</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>chatroom</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/chatroom/chatroom-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>chatroom</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/chatroom/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/chatroom/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/chatroom/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/gwt/gwt-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/gwt/gwt-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/gwt/gwt-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>gwt</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/gwt/gwt-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>gwt</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/gwt/gwt-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/gwt/gwt-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/gwt/gwt-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>gwt</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/gwt/gwt-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/gwt/gwt-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/gwt/gwt-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>gwt</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/gwt/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/gwt/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/gwt/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>helloworld</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>helloworld</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>helloworld</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/helloworld/helloworld-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>helloworld</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/helloworld/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/helloworld/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/helloworld/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/progressbar/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/progressbar/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/progressbar/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>progressbar</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>progressbar</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/remoting/progressbar/progressbar-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>progressbar</artifactId> <groupId>org.jboss.seam.examples.remoting</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/restbay/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/restbay/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/restbay/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Restbay Example</name> Modified: branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/restbay/restbay-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>restbay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/restbay/restbay-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>restbay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/restbay/restbay-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>restbay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/restbay/restbay-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/restbay/restbay-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/restbay/restbay-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>restbay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/rss/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/rss/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/rss/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/rss/rss-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/rss/rss-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/rss/rss-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>rss</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/rss/rss-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/rss/rss-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/rss/rss-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>rss</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/rss/rss-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/rss/rss-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/rss/rss-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>rss</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/rss/rss-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/rss/rss-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/rss/rss-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>rss</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seambay/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seambay/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seambay/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Seambay Example</name> Modified: branches/community/Seam_2_3/examples/seambay/seambay-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seambay/seambay-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seambay/seambay-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seambay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seambay/seambay-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seambay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seambay/seambay-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seambay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seambay/seambay-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seambay/seambay-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seambay/seambay-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seambay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamdiscs/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamdiscs/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamdiscs/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Seamdiscs Example</name> Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamdiscs</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamdiscs</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamdiscs</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamdiscs/seamdiscs-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamdiscs</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seampay/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seampay/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seampay/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Seampay Example</name> Modified: branches/community/Seam_2_3/examples/seampay/seampay-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seampay/seampay-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seampay/seampay-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seampay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seampay/seampay-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seampay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seampay/seampay-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seampay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seampay/seampay-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seampay/seampay-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seampay/seampay-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seampay</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamspace/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamspace/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamspace/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>SeamSpace Example</name> Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamspace/seamspace-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamspace/seamspace-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamspace</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamspace/seamspace-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamspace</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamspace/seamspace-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamspace</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/seamspace/seamspace-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/seamspace/seamspace-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/seamspace/seamspace-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>seamspace</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/spring/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/spring/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/spring/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Spring Example</name> Modified: branches/community/Seam_2_3/examples/spring/spring-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/spring/spring-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/spring/spring-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>spring</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/spring/spring-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/spring/spring-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/spring/spring-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>spring</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/tasks/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/tasks/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/tasks/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Tasks Example</name> Modified: branches/community/Seam_2_3/examples/tasks/tasks-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/tasks/tasks-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/tasks/tasks-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>tasks</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/tasks/tasks-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>tasks</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/tasks/tasks-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>tasks</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/tasks/tasks-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>tasks</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/todo/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/todo/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/todo/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <packaging>pom</packaging> <name>Todo Example</name> Modified: branches/community/Seam_2_3/examples/todo/todo-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/todo/todo-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/todo/todo-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/todo/todo-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/todo/todo-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/todo/todo-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/todo/todo-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/todo/todo-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>todo</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/ui/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/ui/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/ui/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples/ui/ui-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/ui/ui-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/ui/ui-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/ui/ui-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/ui/ui-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/ui/ui-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/ui/ui-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples/ui/ui-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/ui/ui-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples/ui/ui-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>ui</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>booking</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/booking/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/booking/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/booking/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>mail</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/mail/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/mail/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/mail/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -6,7 +6,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>pom</packaging> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>messages</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/examples-ee6/messages/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/messages/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/messages/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>examples-ee6</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/functional-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/functional-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/functional-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/jboss-embedded-bootstrap/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-embedded-bootstrap/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-embedded-bootstrap/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/jboss-seam/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/jboss-seam-debug/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-debug-jsf2/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-excel/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-flex/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-flex/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-gen/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/jboss-seam-ioc/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ioc/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-ioc/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-jsf2/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/jboss-seam-jul/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-jul/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-jul/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/jboss-seam-mail/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/jboss-seam-parent/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-parent</artifactId> <name>Seam Parent</name> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <packaging>pom</packaging> <licenses> Modified: branches/community/Seam_2_3/jboss-seam-pdf/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/jboss-seam-remoting/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-remoting/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-resteasy/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-rss/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -2,7 +2,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/jboss-seam-ui-jsf2/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-ui-jsf2/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-ui-jsf2/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <artifactId>jboss-seam-ui-jsf2</artifactId> Modified: branches/community/Seam_2_3/jboss-seam-wicket/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-wicket/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/jboss-seam-wicket/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,7 +3,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -4,7 +4,7 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/seam-reference-guide/pom.xml =================================================================== --- branches/community/Seam_2_3/seam-reference-guide/pom.xml 2012-03-14 17:22:25 UTC (rev 14386) +++ branches/community/Seam_2_3/seam-reference-guide/pom.xml 2012-03-14 17:27:54 UTC (rev 14387) @@ -3,12 +3,12 @@ <parent> <artifactId>jboss-seam-parent</artifactId> <groupId>org.jboss.seam</groupId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <relativePath>../jboss-seam-parent/pom.xml</relativePath> </parent> <groupId>org.jboss.seam</groupId> <artifactId>seam-reference-guide</artifactId> - <version>2.3.0-SNAPSHOT</version> + <version>2.3.0.Beta1-SNAPSHOT</version> <name>Seam Reference Guide</name> <packaging>jar</packaging>

14 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits March 2012