March 2012 - seam-commits - Jboss List Archives

Seam SVN: r14407 - branches/community/Seam_2_3/examples-ee6/ui/ui-tests.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:53:58 -0400 (Wed, 14 Mar 2012) New Revision: 14407 Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml Log: disabling non-arquillian tests in ARQ profile Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml 2012-03-14 17:53:48 UTC (rev 14406) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml 2012-03-14 17:53:58 UTC (rev 14407) @@ -10,7 +10,7 @@ <groupId>org.jboss.seam.examples</groupId> <artifactId>ui-tests</artifactId> - <name>UI Integration Tests Module</name> + <name>UI Integration Tests Module</name> <dependencies> <dependency> @@ -73,6 +73,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <skip>true</skip> + <junitArtifactName>none:none</junitArtifactName> </configuration> </plugin> </plugins>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14406 - in branches/community/Seam_2_3: distribution/src/main/assembly and 2 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:53:48 -0400 (Wed, 14 Mar 2012) New Revision: 14406 Added: branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml Removed: branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml Modified: branches/community/Seam_2_3/distribution/pom.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml branches/community/Seam_2_3/examples-ee6/pom.xml Log: fixed distribution to be buildable Modified: branches/community/Seam_2_3/distribution/pom.xml =================================================================== --- branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:53:31 UTC (rev 14405) +++ branches/community/Seam_2_3/distribution/pom.xml 2012-03-14 17:53:48 UTC (rev 14406) @@ -278,7 +278,7 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> + <artifactId>examples-ee6</artifactId> <classifier>project</classifier> <version>${project.version}</version> <type>zip</type> Deleted: branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml =================================================================== --- branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml 2012-03-14 17:53:31 UTC (rev 14405) +++ branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml 2012-03-14 17:53:48 UTC (rev 14406) @@ -1,287 +0,0 @@ -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd"> - - <id>distribution</id> - <formats> - - <format>zip</format> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - -  - <fileSets> - -  - <fileSet> - <directory>target/dependency</directory> - <outputDirectory>src</outputDirectory> - <excludes> - <exclude>examples/</exclude> - </excludes> - </fileSet> - -  - <fileSet> - <directory>target/dependency</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>examples/</include> - </includes> - <excludes> - <exclude>examples/wiki/</exclude> - </excludes> - </fileSet> - -  - <fileSet> - <directory>src/main/assembly</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>readme.txt</include> - <include>lgpl.txt</include> - <include>copyright.txt</include> - <include>changelog.txt</include> - <include>seam21migration.txt</include> - <include>seam2migration.txt</include> - <include>clustering-howto.txt</include> - <include>seam</include> - <include>seam.bat</include> - </includes> - </fileSet> - <fileSet> - <directory>../extras</directory> - <outputDirectory>extras</outputDirectory> - <includes> - <include>mail-ra.rar</include> - <include>jsUnit/**</include> - <include>readme.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>../jboss-seam/target</directory> - <outputDirectory>lib/interop</outputDirectory> - <includes> - <include>jboss-seam-wls-compatible.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>../jboss-seam/target</directory> - <outputDirectory>lib/interop/src</outputDirectory> - <includes> - <include>jboss-seam-wls-compatible-sources.jar</include> - </includes> - </fileSet> -  - <fileSet> - <directory>../jar-dependencies</directory> - <outputDirectory>./lib</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - </fileSet> - </fileSets> - - <dependencySets> - -  - <dependencySet> - <outputDirectory>.</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam:jboss-embedded-bootstrap</include> - </includes> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>META-INF/**</exclude> - <exclude>.settings/</exclude> - <exclude>**/.settings/</exclude> - <exclude>.gitignore</exclude> - <exclude>.project</exclude> - <exclude>.classpath</exclude> - <exclude>**/.project</exclude> - <exclude>**/.classpath</exclude> - </excludes> - </unpackOptions> - <outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/src</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:*:*:sources</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude> - <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:jboss-seam:ejb</include> - <include>org.jboss.seam:jboss-seam-debug:jar</include> - <include>org.jboss.seam:jboss-seam-ui:jar</include> - <include>org.jboss.seam:jboss-seam-excel:jar</include> - <include>org.jboss.seam:jboss-seam-pdf:jar</include> - <include>org.jboss.seam:jboss-seam-mail:jar</include> - <include>org.jboss.seam:jboss-seam-rss:jar</include> - <include>org.jboss.seam:jboss-seam-resteasy:jar</include> - <include>org.jboss.seam:jboss-seam-wicket:jar</include> - <include>org.jboss.seam:jboss-seam-remoting:jar</include> - <include>org.jboss.seam:jboss-seam-flex:jar</include> - <include>org.jboss.seam:jboss-seam-ioc:jar</include> - <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/interop</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:jboss-seam-jul:jar</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/interop/src</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:jboss-seam-jul:jar:sources</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/gen</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <useTransitiveDependencies>true</useTransitiveDependencies> - <includes> - <include>org.jboss.seam:jboss-seam-gen:jar</include> - <include>org.hibernate:hibernate-tools:jar</include> - <include>org.beanshell:bsh:jar</include> - <include>org.hibernate:jtidy:jar</include> - <include>freemarker:freemarker:jar</include> - <include>org.eclipse.core:runtime:jar</include> - <include>org.eclipse.equinox:common:jar</include> - <include>org.eclipse:text:jar</include> - <include>org.richfaces.samples:darkX:jar</include> - <include>org.richfaces.samples:laguna:jar</include> - <include>org.richfaces.samples:glassX:jar</include> - <include>org.apache.ant:ant:jar</include> - <include>org.apache.ant:ant-launcher:jar</include> - <include>org.apache.ant:ant-nodeps:jar</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/gen/src</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam:jboss-seam-gen:*:sources</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> - <outputDirectory>./seam-gen</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>**/.gitignore</exclude> - </excludes> - </unpackOptions> - <includes> - <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/test</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam.embedded:hibernate-all:*</include> - <include>org.jboss.seam.embedded:jboss-embedded-all:*</include> - <include>org.jboss.seam.embedded:thirdparty-all:*</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>doc/reference/</outputDirectory> - <unpack>true</unpack> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam:seam-reference-guide</include> - </includes> - <unpackOptions> - <excludes> - <exclude>META-INF/</exclude> - </excludes> - </unpackOptions> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>doc/api</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>META-INF/</exclude> - </excludes> - </unpackOptions> - <includes> - <include>org.jboss.seam:jboss-seam:*:javadoc</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> - <outputDirectory>doc/ui/apidocs</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>META-INF/</exclude> - </excludes> - </unpackOptions> - <includes> - <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - </dependencySets> -</assembly> Deleted: branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml =================================================================== --- branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml 2012-03-14 17:53:31 UTC (rev 14405) +++ branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf2.xml 2012-03-14 17:53:48 UTC (rev 14406) @@ -1,296 +0,0 @@ -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd"> - - <id>distribution-jsf2</id> - <formats> - <format>dir</format> - - - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - -  - <fileSets> - -  - <fileSet> - <directory>target/dependency</directory> - <outputDirectory>src</outputDirectory> - <excludes> - <exclude>examples/</exclude> - </excludes> - </fileSet> - -  - <fileSet> - <directory>target/dependency</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>examples/</include> - </includes> - <excludes> - <exclude>examples/wiki/</exclude> - </excludes> - </fileSet> - -  - <fileSet> - <directory>src/main/assembly</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>readme.txt</include> - <include>lgpl.txt</include> - <include>copyright.txt</include> - <include>changelog.txt</include> - <include>seam21migration.txt</include> - <include>seam2migration.txt</include> - <include>clustering-howto.txt</include> - <include>seam</include> - <include>seam.bat</include> - </includes> - </fileSet> - <fileSet> - <directory>../extras</directory> - <outputDirectory>extras</outputDirectory> - <includes> - <include>mail-ra.rar</include> - <include>jsUnit/**</include> - <include>readme.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>../jboss-seam-jsf2/target</directory> - <outputDirectory>lib/interop</outputDirectory> - <includes> - <include>jboss-seam-jsf2-wls-compatible.jar</include> - </includes> - </fileSet> - <fileSet> - <directory>../jboss-seam-jsf2/target</directory> - <outputDirectory>lib/interop/src</outputDirectory> - <includes> - <include>jboss-seam-jsf2-wls-compatible-sources.jar</include> - </includes> - </fileSet> -  - <fileSet> - <directory>../jar-dependencies</directory> - <outputDirectory>./lib</outputDirectory> - <includes> - <include>*.jar</include> - </includes> - </fileSet> - </fileSets> - - <dependencySets> - -  - <dependencySet> - <outputDirectory>.</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam:jboss-embedded-bootstrap</include> - </includes> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>META-INF/**</exclude> - <exclude>.settings/</exclude> - <exclude>**/.settings/</exclude> - <exclude>.gitignore</exclude> - <exclude>.project</exclude> - <exclude>.classpath</exclude> - <exclude>**/.project</exclude> - <exclude>**/.classpath</exclude> - </excludes> - </unpackOptions> - <outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/src</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:*:*:sources</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude> - <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude> - <exclude>org.jboss.seam:jboss-seam-ui:*:sources</exclude> - <exclude>org.jboss.seam:jboss-seam:*:sources</exclude> - <exclude>org.jboss.seam:jboss-seam-debug:*:sources</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:jboss-seam-jsf2:ejb</include> - <include>org.jboss.seam:jboss-seam-debug-jsf2:jar</include> - <include>org.jboss.seam:jboss-seam-ui-jsf2:jar</include> - <include>org.jboss.seam:jboss-seam-excel:jar</include> - <include>org.jboss.seam:jboss-seam-pdf:jar</include> - <include>org.jboss.seam:jboss-seam-mail:jar</include> - <include>org.jboss.seam:jboss-seam-rss:jar</include> - <include>org.jboss.seam:jboss-seam-resteasy:jar</include> - <include>org.jboss.seam:jboss-seam-wicket:jar</include> - <include>org.jboss.seam:jboss-seam-remoting:jar</include> - <include>org.jboss.seam:jboss-seam-flex:jar</include> - <include>org.jboss.seam:jboss-seam-ioc:jar</include> - <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam:ejb:jar</exclude> - <exclude>org.jboss.seam:jboss-seam-ui:jar</exclude> - <exclude>org.jboss.seam:jboss-seam-debug:jar</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/interop</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:jboss-seam-jul:jar</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/interop/src</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>org.jboss.seam:jboss-seam-jul:jar:sources</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>lib/gen</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <useTransitiveDependencies>true</useTransitiveDependencies> - <includes> - <include>org.jboss.seam:jboss-seam-gen:jar</include> - <include>org.hibernate:hibernate-tools:jar</include> - <include>org.beanshell:bsh:jar</include> - <include>org.hibernate:jtidy:jar</include> - <include>freemarker:freemarker:jar</include> - <include>org.eclipse.core:runtime:jar</include> - <include>org.eclipse.equinox:common:jar</include> - <include>org.eclipse:text:jar</include> - <include>org.richfaces.samples:darkX:jar</include> - <include>org.richfaces.samples:laguna:jar</include> - <include>org.richfaces.samples:glassX:jar</include> - <include>org.apache.ant:ant:jar</include> - <include>org.apache.ant:ant-launcher:jar</include> - <include>org.apache.ant:ant-nodeps:jar</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/gen/src</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam:jboss-seam-gen:*:sources</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> - <outputDirectory>./seam-gen</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>**/.gitignore</exclude> - </excludes> - </unpackOptions> - <includes> - <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/test</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam.embedded:hibernate-all:*</include> - <include>org.jboss.seam.embedded:jboss-embedded-all:*</include> - <include>org.jboss.seam.embedded:thirdparty-all:*</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>doc/reference/</outputDirectory> - <unpack>true</unpack> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam:seam-reference-guide</include> - </includes> - <unpackOptions> - <excludes> - <exclude>META-INF/</exclude> - </excludes> - </unpackOptions> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - -  - <dependencySet> - <outputDirectory>doc/api</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>META-INF/</exclude> - </excludes> - </unpackOptions> - <includes> - <include>org.jboss.seam:jboss-seam-jsf2:*:javadoc</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> - <outputDirectory>doc/ui/apidocs</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <unpack>true</unpack> - <unpackOptions> - <excludes> - <exclude>META-INF/</exclude> - </excludes> - </unpackOptions> - <includes> - <include>org.jboss.seam:jboss-seam-ui-jsf2:*:javadoc</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - </dependencySets> -</assembly> - Copied: branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml (from rev 14405, branches/community/Seam_2_3/distribution/src/main/assembly/dist-jsf12.xml) =================================================================== --- branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml (rev 0) +++ branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml 2012-03-14 17:53:48 UTC (rev 14406) @@ -0,0 +1,283 @@ +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.2 http://maven.apache.org/xsd/assembly-2.2.xsd"> + + <id>dist</id> + <formats> + + <format>zip</format> + <format>tar.gz</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + +  + <fileSets> + +  + <fileSet> + <directory>target/dependency</directory> + <outputDirectory>src</outputDirectory> + <excludes> + <exclude>examples/</exclude> + </excludes> + </fileSet> + +  + <fileSet> + <directory>target/dependency</directory> + <outputDirectory>.</outputDirectory> + <includes> + <include>examples/</include> + </includes> + <excludes> + <exclude>examples/wiki/</exclude> + </excludes> + </fileSet> + +  + <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory>.</outputDirectory> + <includes> + <include>readme.txt</include> + <include>lgpl.txt</include> + <include>copyright.txt</include> + <include>changelog.txt</include> + <include>seam21migration.txt</include> + <include>seam2migration.txt</include> + <include>clustering-howto.txt</include> + <include>seam</include> + <include>seam.bat</include> + </includes> + </fileSet> + <fileSet> + <directory>../extras</directory> + <outputDirectory>extras</outputDirectory> + <includes> + <include>mail-ra.rar</include> + <include>jsUnit/**</include> + <include>readme.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>../jboss-seam/target</directory> + <outputDirectory>lib/interop</outputDirectory> + <includes> + <include>jboss-seam-wls-compatible.jar</include> + </includes> + </fileSet> + <fileSet> + <directory>../jboss-seam/target</directory> + <outputDirectory>lib/interop/src</outputDirectory> + <includes> + <include>jboss-seam-wls-compatible-sources.jar</include> + </includes> + </fileSet> +  + <fileSet> + <directory>../jar-dependencies</directory> + <outputDirectory>./lib</outputDirectory> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + </fileSets> + + <dependencySets> + +  + <dependencySet> + <outputDirectory>.</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.jboss.seam:jboss-embedded-bootstrap</include> + </includes> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>META-INF/**</exclude> + <exclude>.settings/</exclude> + <exclude>**/.settings/</exclude> + <exclude>.gitignore</exclude> + <exclude>.project</exclude> + <exclude>.classpath</exclude> + <exclude>**/.project</exclude> + <exclude>**/.classpath</exclude> + </excludes> + </unpackOptions> + <outputFileNameMapping>${artifact.artifactId}</outputFileNameMapping> + </dependencySet> + +  + <dependencySet> + <outputDirectory>lib/src</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.seam:*:*:sources</include> + </includes> + <excludes> + <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude> + <exclude>org.jboss.seam:jboss-seam-jul:*:sources</exclude> + </excludes> + <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping> + </dependencySet> + +  + <dependencySet> + <outputDirectory>lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.seam:jboss-seam:ejb</include> + <include>org.jboss.seam:jboss-seam-debug:jar</include> + <include>org.jboss.seam:jboss-seam-ui:jar</include> + <include>org.jboss.seam:jboss-seam-excel:jar</include> + <include>org.jboss.seam:jboss-seam-pdf:jar</include> + <include>org.jboss.seam:jboss-seam-mail:jar</include> + <include>org.jboss.seam:jboss-seam-rss:jar</include> + <include>org.jboss.seam:jboss-seam-resteasy:jar</include> + <include>org.jboss.seam:jboss-seam-wicket:jar</include> + <include>org.jboss.seam:jboss-seam-remoting:jar</include> + <include>org.jboss.seam:jboss-seam-flex:jar</include> + <include>org.jboss.seam:jboss-seam-ioc:jar</include> + <include>org.jboss.seam.embedded:jboss-embedded-api:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + +  + <dependencySet> + <outputDirectory>lib/interop</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.seam:jboss-seam-jul:jar</include> + </includes> + <excludes> + <exclude>org.jboss.seam:jboss-seam-jul:jar:sources</exclude> + </excludes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + +  + <dependencySet> + <outputDirectory>lib/interop/src</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>org.jboss.seam:jboss-seam-jul:jar:sources</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping> + </dependencySet> + +  + <dependencySet> + <outputDirectory>lib/gen</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useStrictFiltering>true</useStrictFiltering> + <useTransitiveDependencies>true</useTransitiveDependencies> + <includes> + <include>org.jboss.seam:jboss-seam-gen:jar</include> + <include>org.hibernate:hibernate-tools:jar</include> + <include>org.beanshell:bsh:jar</include> + <include>org.hibernate:jtidy:jar</include> + <include>freemarker:freemarker:jar</include> + <include>org.eclipse.core:runtime:jar</include> + <include>org.eclipse.equinox:common:jar</include> + <include>org.eclipse:text:jar</include> + <include>org.apache.ant:ant:jar</include> + <include>org.apache.ant:ant-launcher:jar</include> + <include>org.apache.ant:ant-nodeps:jar</include> + </includes> + <excludes> + <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude> + </excludes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/gen/src</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.jboss.seam:jboss-seam-gen:*:sources</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + + <dependencySet> + <outputDirectory>./seam-gen</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>**/.gitignore</exclude> + </excludes> + </unpackOptions> + <includes> + <include>org.jboss.seam:jboss-seam-gen:zip:distribution</include> + </includes> + </dependencySet> + + <dependencySet> + <outputDirectory>lib/test</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.jboss.seam.embedded:hibernate-all:*</include> + <include>org.jboss.seam.embedded:jboss-embedded-all:*</include> + <include>org.jboss.seam.embedded:thirdparty-all:*</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + +  + <dependencySet> + <outputDirectory>doc/reference/</outputDirectory> + <unpack>true</unpack> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.jboss.seam:seam-reference-guide</include> + </includes> + <unpackOptions> + <excludes> + <exclude>META-INF/</exclude> + </excludes> + </unpackOptions> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + +  + <dependencySet> + <outputDirectory>doc/api</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>META-INF/</exclude> + </excludes> + </unpackOptions> + <includes> + <include>org.jboss.seam:jboss-seam:*:javadoc</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + + <dependencySet> + <outputDirectory>doc/ui/apidocs</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <unpack>true</unpack> + <unpackOptions> + <excludes> + <exclude>META-INF/</exclude> + </excludes> + </unpackOptions> + <includes> + <include>org.jboss.seam:jboss-seam-ui:*:javadoc</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + + </dependencySets> +</assembly> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:53:31 UTC (rev 14405) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:53:48 UTC (rev 14406) @@ -94,10 +94,6 @@ <directory>src/test/resources-integration</directory> <filtering>true</filtering> </testResource> - <testResource>  - <directory>${basedir}/../dvdstore-ear/src/main/resources</directory> - <filtering>true</filtering> - </testResource> </testResources> <plugins> Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:53:31 UTC (rev 14405) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:53:48 UTC (rev 14406) @@ -16,7 +16,7 @@ <modules> <module>booking</module> - <module>dvdstore</module> + <module>excel</module> <module>mail</module> <module>messages</module>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14405 - in branches/community/Seam_2_3/examples-ee6/dvdstore: dvdstore-tests and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:53:31 -0400 (Wed, 14 Mar 2012) New Revision: 14405 Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml Log: JBSEAM-4900 fixed dvdstore integration tests setup Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java 2012-03-14 17:52:52 UTC (rev 14404) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java 2012-03-14 17:53:31 UTC (rev 14405) @@ -72,7 +72,6 @@ } @Column(name="ASIN", length=16) - @Field(index=Index.NO) public String getASIN() { return asin; } Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:52:52 UTC (rev 14404) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:53:31 UTC (rev 14405) @@ -85,6 +85,21 @@ </dependencies> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + <filtering>true</filtering> + </testResource> + <testResource>  + <directory>${basedir}/../dvdstore-ear/src/main/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> <plugin> <artifactId>maven-clean-plugin</artifactId>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14404 - in branches/community/Seam_2_3/examples-ee6: excel and 37 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:52:52 -0400 (Wed, 14 Mar 2012) New Revision: 14404 Added: branches/community/Seam_2_3/examples-ee6/excel/ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/main/ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/main/application/ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/main/application/META-INF/ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/seam/example/excel/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/seam/example/excel/ExcelTest.java branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/ejb-jar.xml branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/excel/excel-tests/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/selenium/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/WEB-INF/ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/excel/excel-web/ branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/css/ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/css/screen.css branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/home.xhtml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/people.xhtml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/repeat.xhtml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/simple.xhtml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-csv.xhtml branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-jxl.xhtml branches/community/Seam_2_3/examples-ee6/excel/features.txt branches/community/Seam_2_3/examples-ee6/excel/pom.xml branches/community/Seam_2_3/examples-ee6/excel/readme.txt Modified: branches/community/Seam_2_3/examples-ee6/pom.xml Log: JBSEAM-4852 add the ee6 excel example update the excel readme.txt Added: branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/pom.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,75 @@ +<?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>excel</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>excel-ear</artifactId> + <packaging>ear</packaging> + <name>Excel EAR Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-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-excel</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <version>6</version> + <defaultLibBundleDir>lib</defaultLibBundleDir> +  + <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> +  + <generateApplicationXml>true</generateApplicationXml> + <filtering>true</filtering> + <modules> + <webModule> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-web</artifactId> + <contextRoot>/seam-excel</contextRoot> + <bundleFileName>excel-web.war</bundleFileName> + </webModule> + <ejbModule> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-ejb</artifactId> + <bundleFileName>excel-ejb.jar</bundleFileName> + </ejbModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,9 @@ +<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"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,53 @@ +<?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>excel</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>excel-ejb</artifactId> + <packaging>ejb</packaging> + <name>Excel EJB Module (EE6)</name> + + <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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> +  + </dependencies> + +</project> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/seam/example/excel/ExcelTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/seam/example/excel/ExcelTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/java/org/jboss/seam/example/excel/ExcelTest.java 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,120 @@ +package org.jboss.seam.example.excel; + +import java.util.LinkedList; +import java.util.List; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +@Name("excelTest") +(a)Scope(ScopeType.SESSION) +public class ExcelTest +{ + + private List<Person> people = new LinkedList<Person>(); + private List<Person> result = new LinkedList<Person>(); + private List<List<Person>> repeat = new LinkedList<List<Person>>(); + private String searchWord; + + + @Create + public void create() + { + people.add(new Person("Pete Muir", "Red Hat Inc.", "Project Lead")); + people.add(new Person("Gavin King", "Red Hat Inc.", "Project Founder")); + people.add(new Person("Norman Richards", "Red Hat Inc.", "Seam Core")); + people.add(new Person("Shane Bryzak", "Red Hat Inc.", "Seam Security, Seam Remoting")); + people.add(new Person("Michael Yuan", "Individual", "")); + people.add(new Person("Mike Youngstrom", "Individual", "Spring Integration")); + people.add(new Person("Ales Justin", "Red Hat Inc.", "JBoss5/MC Integration")); + people.add(new Person("Christian Bauer", "Red Hat Inc.", "Seam Wiki, REST and GWT integration")); + people.add(new Person("Jay Balunas", "Red Hat Inc.", "Cross-platform testing")); + people.add(new Person("Dan Allen", "Individual", "Seam-gen, Bug fixes")); + people.add(new Person("Matt Drees", "Individual", "Seam Core")); + people.add(new Person("Jacob Orshalick", "Focus IT Solutions LLC", "")); + people.add(new Person("Nicklas \"Nik\" Karlsson", "Individual", "Excel reporting")); + people.add(new Person("Daniel Roth", "Individual", "Excel reporting")); + people.add(new Person("Judy Guglielmin", "ICESoft Inc.", "ICEFaces integration")); + people.add(new Person("Max Rydahl Andersen", "Red Hat Inc.", "Lead developer JBoss Tools, Hibernate Tools, Seam Tools")); + people.add(new Person("Emmanuel Bernard", "Red Hat Inc.", "Lead developer Hibernate Annotations, EntityManager, Validator, Search")); + repeat.add(people.subList(0, 5)); + } + + public List<List<Person>> getRepeat() + { + return repeat; + } + + public void setRepeat(List<List<Person>> repeat) + { + this.repeat = repeat; + } + + public void setSearchWord(String searchWord) + { + this.searchWord = searchWord; + } + + public String getSearchWord() + { + return searchWord; + } + + public List<Person> getPeople() + { + return people; + } + + public List<Person> getResult() + { + return result; + } + + public void search() + { + result = new LinkedList<Person>(); + for (Person person : people) + { + if (person.getName().toLowerCase().contains(searchWord.toLowerCase())) + result.add(person); + } + } + + public void clear() + { + this.result = new LinkedList<Person>(); + } + + public class Person + { + String name; + String company; + String task; + + public Person(String name, String company, String task) + { + this.company = company; + this.name = name; + this.task = task; + } + + public String getName() + { + return name; + } + + public String getTask() + { + return task; + } + + public String getCompany() + { + return company; + } + + } + +} Added: branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/ejb-jar.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/ejb-jar.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,19 @@ +<?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> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/META-INF/persistence.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,16 @@ +<?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="userDatabase"> + <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.show_sql" value="true"/> + <property name="jboss.entity.manager.factory.jndi.name" + value="java:/seamexcelEntityManagerFactory"/> + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/seam.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/src/main/resources/seam.properties 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1 @@ + Added: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,191 @@ +<?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>excel</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>excel-tests</artifactId> + <name>Excel Integration Tests Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-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>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </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> + +  + <dependency> + <groupId>net.sourceforge.jexcelapi</groupId> + <artifactId>jxl</artifactId> + </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> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-excel</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-mail</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-pdf</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-rss</artifactId> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </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-excel</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/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/RenderTest.java 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,86 @@ +package org.jboss.seam.example.excel.test; + +import java.io.File; +import java.io.ByteArrayInputStream; + +import jxl.Sheet; +import jxl.Workbook; + +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +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.document.ByteArrayDocumentData; +import org.jboss.seam.document.DocumentData; +import org.jboss.seam.faces.Renderer; +import org.jboss.seam.mock.JUnitSeamTest; +import org.junit.runner.RunWith; +import org.junit.Test; + +/** + * @author Daniel Roth + * + * Really small test. Renders an jxl excel file from jsf tags and + * verifies the content. + * + */ +(a)RunWith(Arquillian.class) +public class RenderTest extends JUnitSeamTest { + + @Deployment(name="RenderTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-excel.ear").importFrom(new File("../excel-ear/target/seam-excel.ear")) + .as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "excel-web.war"); + web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory"); + web.addClasses(RenderTest.class); + + return er; + } + + @Test + public void testSimple() throws Exception { + + new FacesRequest() { + + @Override + protected void updateModelValues() throws Exception { + } + + @Override + protected void invokeApplication() throws Exception { + + Renderer.instance().render("/simple.xhtml"); + + DocumentData data = (DocumentData) Contexts.getEventContext().get("testExport"); + Workbook workbook = Workbook.getWorkbook(new ByteArrayInputStream(((ByteArrayDocumentData)data).getData())); + Sheet sheet = workbook.getSheet("Developers"); + + assert sheet != null; + + assert "Daniel Roth".equals(sheet.getCell(0, 0).getContents()); + assert "Nicklas Karlsson".equals(sheet.getCell(0, 1).getContents()); + + } + }.run(); + } + + public static void main(String[] args) { + RenderTest t = new RenderTest(); + try { + t.testSimple(); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } +} Added: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/java/org/jboss/seam/example/excel/test/selenium/SeleniumExcelTest.java 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,27 @@ +package org.jboss.seam.example.excel.test.selenium; + +import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import static org.testng.AssertJUnit.assertEquals; + +public class SeleniumExcelTest extends SeamSeleniumTest +{ + public static final String HOME_PAGE = "/home.seam"; + public static final String HOME_PAGE_TITLE = "Microsoft® Excel® Export examples"; + + @BeforeMethod + @Override + public void setUp() { + super.setUp(); + browser.open(CONTEXT_PATH + HOME_PAGE); + } + + /** + * Place holder - just verifies that example deploys + */ + @Test + public void homePageLoadTest() { + assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle()); + } +} Added: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/WEB-INF/components.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,27 @@ +<components xmlns="http://jboss.com/products/seam/components" + xmlns:excel="http://jboss.com/products/seam/excel" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:document="http://jboss.com/products/seam/document" + 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/framework http://jboss.com/products/seam/framework-2.3.xsd + http://jboss.com/products/seam/document http://jboss.com/products/seam/document-2.3.xsd + http://jboss.com/products/seam/excel http://jboss.com/products/seam/excel-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + + <core:init debug="true" jndi-pattern="#{ejbName}/local" /> + + <document:document-store use-extensions="true"></document:document-store> + +  + +</components> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/seam.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources/seam.properties 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,3 @@ +#debug is explicitly disabled in test to avoid JBIDE-3623 +#Thu Dec 31 16:24:37 CET 2009 +org.jboss.seam.core.init.debug=false Added: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-ftest/testng.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,26 @@ + +  +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Excel example" verbose="2" parallel="false"> + <test name="excel_tests"> + <parameter name="PROPERTY_FILE" value="" /> + <classes> + <class name="org.jboss.seam.example.excel.test.selenium.SeleniumExcelTest" /> + </classes> + </test> +</suite> Property changes on: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-ftest/testng.xml ___________________________________________________________________ Added: svn:executable + * Added: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/arquillian.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,17 @@ +<?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> + </configuration> + </container> + +</arquillian> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/src/test/resources-integration/testng.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,11 @@ +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > + +<suite name="Excel" verbose="2" parallel="false"> + + <test name="Excel Tests"> + <classes> + <class name="org.jboss.seam.example.excel.test.RenderTest"/> + </classes> + </test> + +</suite> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,89 @@ +<?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>excel</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>excel-web</artifactId> + <packaging>war</packaging> + <name>Excel Web Module (EE6)</name> + + <properties> +  + <jndiPattern>java:app/excel-ejb/#{ejbName}</jndiPattern> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-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> + </exclusions> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-excel</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + <version>4.1.0.Final</version> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + <version>4.1.0.Final</version> + </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> + +</project> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/components.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,27 @@ +<components xmlns="http://jboss.com/products/seam/components" + xmlns:excel="http://jboss.com/products/seam/excel" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:document="http://jboss.com/products/seam/document" + 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/framework http://jboss.com/products/seam/framework-2.3.xsd + http://jboss.com/products/seam/document http://jboss.com/products/seam/document-2.3.xsd + http://jboss.com/products/seam/excel http://jboss.com/products/seam/excel-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + + <core:init debug="true" jndi-pattern="@jndiPattern@" /> + + <document:document-store use-extensions="true"></document:document-store> + +  + +</components> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/faces-config.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="2.1" + 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_1.xsd"> +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/pages.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,7 @@ +<?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.0.xsd" > + + + +</pages> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/WEB-INF/web.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> + <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>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + <servlet> + <servlet-name>Document Store Servlet</servlet-name> + <servlet-class>org.jboss.seam.document.DocumentStoreServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Document Store Servlet</servlet-name> + <url-pattern>*.csv</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Document Store Servlet</servlet-name> + <url-pattern>*.xls</url-pattern> + </servlet-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> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>webAppRootKey</param-name> + <param-value>seam-excel</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + +  + <context-param> + <param-name>com.sun.faces.allowTextChildren</param-name> + <param-value>true</param-value> + </context-param> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> +</web-app> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/css/screen.css =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/css/screen.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/css/screen.css 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,47 @@ +/* Setup defaults since variable in browsers +----------------------------------------------- */ +body, div, span, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset { + margin: 0; + padding: 0; +} +/* Element Defaults +----------------------------------------------- */ +html { + height: 100%; + margin: 5px; + +} +img { + border: 0; +} +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: small; + line-height: 1.25em; + position: relative; + height: 100%; + margin-left: auto; + margin-right: auto; +} +input { + border: 1px solid #C3BBB6; + padding: 2px; + margin: 3px 0; +} +select { + border: 1px solid #C3BBB6; + padding: 4px; + margin: 5px 0; +} + +.header { + font-size: 16px; +} + +.subheader { + font-size: 14px; +} + +.plain { + font-size: 12px; +} \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/home.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/home.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/home.xhtml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,110 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:e="http://jboss.com/products/seam/excel" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:rich="http://richfaces.org/rich"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<title>Microsoft® Excel® Export examples</title> +<link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body id="excelHome"> +<f:view> + + <h:outputText value="Microsoft® Excel® Export examples" + styleClass="header"></h:outputText> + <br /> + <br /> + + <h:outputText value="Export ajax searchable Richfaces table" + styleClass="subheader"></h:outputText> + <br /> + <h:form id="excelExport"> + <h:inputText value="#{excelTest.searchWord}" /> + <a4j:commandButton value="Search" reRender="searchResults" + action="#{excelTest.search}" /> + <a4j:commandButton value="Clear" reRender="searchResults" + action="#{excelTest.clear}" /> + <br /> + + <a4j:outputPanel id="searchResults"> + <rich:dataTable value="#{excelTest.result}" var="person" + rendered="#{!empty excelTest.result}" id="excelTable" + style="xls-font: 10 Verdana; xls-column-widths: 8000 9000 10000" + columnClasses="left, right" width="500px"> + <rich:column> + <f:facet name="header"> + <h:outputText value="Name" style="xls-font: red bold"/> + </f:facet> + <h:outputText value="#{person.name}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Company" style="xls-font: red bold" /> + </f:facet> + <h:outputText value="#{person.company}" /> + </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Working on" style="xls-font: red bold" /> + </f:facet> + <h:outputText value="#{person.task}" /> + </rich:column> + <rich:column style="xls-column-export:false"> + <f:facet name="header"> + <h:outputText value="Hide in export" style="xls-font: red bold" /> + </f:facet> + <h:outputText value="Details" /> + </rich:column> + </rich:dataTable> + <h:commandLink value="Export table as Excel spreadsheet" + rendered="#{!empty excelTest.result}" + action="#{excelExporter.export('excelExport:excelTable')}" /> + <br /> + <h:commandLink value="Export table as CSV" + rendered="#{!empty excelTest.result}" + action="#{excelExporter.export('excelExport:excelTable','csv')}" /> + </a4j:outputPanel> + + </h:form> + + <br /> + <br /> + <br /> + + <h:outputText value="Export xhtml file, use-extension enabled." + styleClass="subheader"></h:outputText> + <br /> + <h:outputLink value="vanilla-jxl.seam"> + <h:outputText>Export as Excel® spreadsheet</h:outputText> + </h:outputLink> + <br /> + + <h:outputLink value="vanilla-csv.seam"> + <h:outputText>Export as comma separated file</h:outputText> + </h:outputLink> + <br /> + <br /> + <br /> + + <h:outputText value="Repeat and inline value" styleClass="subheader"></h:outputText> + <br/> + <h:outputText value="(Shows that you can use ui:repeat inside a cell.)" styleClass="plain"></h:outputText> + <br /> + + <h:outputLink value="repeat.seam"> + <h:outputText>Export as Excel® spreadsheet</h:outputText> + </h:outputLink> + <br /> + <br /> + <br /> + + +</f:view> +</body> +</html> + Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/index.html 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=home.seam"> +</head> +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/people.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/people.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/people.xhtml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,33 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:e="http://jboss.com/products/seam/excel" + xmlns:f="http://java.sun.com/jsf/core"> + +<e:workbook type="#{exportType}"> + <e:worksheet name="People" value="#{people}" var="person"> + <e:header> + <f:facet name="left"> + The date is #date# and the time is #time# + </f:facet> + </e:header> + <e:column style="xls-column-autosize: true"> + <f:facet name="header"> + <e:cell value="Name" style="xls-font: red bold 10 Verdana"/> + </f:facet> + <e:cell value="#{person.name}" forceType="text" /> + </e:column> + <e:column style="xls-column-autosize: true"> + <f:facet name="header"> + <e:cell value="Company" style="xls-font: red bold 10 Verdana"/> + </f:facet> + <e:cell value="#{person.company}" /> + </e:column> + <e:column style="xls-column-autosize: true"> + <f:facet name="header"> + <e:cell value="Working on" style="xls-font: red bold 10 Verdana"/> + </f:facet> + <e:cell value="#{person.task}" forceType="text" /> + </e:column> + </e:worksheet> +</e:workbook> +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/repeat.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/repeat.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/repeat.xhtml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,21 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:e="http://jboss.com/products/seam/excel" + xmlns:f="http://java.sun.com/jsf/core"> + +<e:workbook type="jxl"> + <e:worksheet name="Five first commiters" value="#{excelTest.repeat}" + var="list"> + <e:column> + <f:facet name="header"> + <e:cell value="Names of committers" /> + </f:facet> + <e:cell> + <ui:repeat value="#{list}" var="person"> + #{person.name}, + </ui:repeat> + </e:cell> + </e:column> + </e:worksheet> +</e:workbook> +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/simple.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/simple.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/simple.xhtml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,8 @@ +<e:workbook exportKey="testExport" + xmlns:e="http://jboss.com/products/seam/excel" + xmlns:f="http://java.sun.com/jsf/core"> + <e:worksheet name="Developers"> + <e:cell column="0" row="0" value="Daniel Roth" /> + <e:cell column="0" row="1" value="Nicklas Karlsson" /> + </e:worksheet> +</e:workbook> Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-csv.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-csv.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-csv.xhtml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,9 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <ui:include src="people.xhtml"> + <ui:param name="exportType" value="csv" /> + <ui:param name="people" value="#{excelTest.people}" /> + </ui:include> + +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-jxl.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-jxl.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/src/main/webapp/vanilla-jxl.xhtml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,9 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets"> + + <ui:include src="people.xhtml"> + <ui:param name="exportType" value="jxl" /> + <ui:param name="people" value="#{excelTest.people}" /> + </ui:include> + +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/excel/features.txt =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/features.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/features.txt 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,27 @@ +Features: + +* URI-based .xls templates +* Multiple worksheets per workbook +* Multiple datasets per worksheet +* Configurable starting coordinates for data sets +* Custom mask options for numeric/date types +* Cell formats (fonts, backgrounds, borders etc) +* Cascading template support for cell formats +* Many workbook settings (JExcelAPI) +* Many worksheet settings (JExcelAPI) +* Cascading template support for worksheet settings +* Headers/Footers, print areas etc. +* Comments +* Formulas +* URI-based images +* Hyperlinks + +Planned: + +* Multiple data cells per column +* Workaround for the 65k-rows limit of Excel +* Validations + +Possible? +* Charts +* Property sets Added: branches/community/Seam_2_3/examples-ee6/excel/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/pom.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,49 @@ +<?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"> + <parent> + <artifactId>examples-ee6</artifactId> + <groupId>org.jboss.seam</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel</artifactId> + <packaging>pom</packaging> + <name>Excel Example (EE6)</name> + + <modules> + <module>excel-ejb</module> + <module>excel-web</module> + <module>excel-ear</module> + <module>excel-tests</module> + </modules> + + <properties> + <example.name>excel</example.name> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>excel-ear</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Added: branches/community/Seam_2_3/examples-ee6/excel/readme.txt =================================================================== --- branches/community/Seam_2_3/examples-ee6/excel/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/excel/readme.txt 2012-03-14 17:52:52 UTC (rev 14404) @@ -0,0 +1,21 @@ +Seam Excel Example +================== + +This example demonstrates the Seam Excel functionality. It runs on JBoss AS7 as +an EAR. + +To deploy the example to JBoss AS7 , follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* Start the AS7 up. + +* Deploy the sample: + + $JBOSS_HOME/bin/jboss-cli.sh --connect 'deploy excel-ear/target/seam-excel.ear' + +* Open this URL in a web browser: http://localhost:8080/seam-excel Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:51:00 UTC (rev 14403) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:52:52 UTC (rev 14404) @@ -17,6 +17,7 @@ <modules> <module>booking</module> <module>dvdstore</module> + <module>excel</module> <module>mail</module> <module>messages</module> <module>todo</module>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14403 - in branches/community/Seam_2_3/examples-ee6: dvdstore/dvdstore-tests and 3 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:51:00 -0400 (Wed, 14 Mar 2012) New Revision: 14403 Added: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/arquillian.xml Removed: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/testng.xml Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/pom.xml Log: JBSEAM-4900 migrated dvdstore tests to Junit Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-03-14 17:51:00 UTC (rev 14403) @@ -53,40 +53,40 @@ <artifactId>persistence-api</artifactId> <scope>provided</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>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/test/bootstrap</directory> - <filtering>false</filtering> - </testResource> - <testResource>  - <directory>${basedir}/../dvdstore-ear/src/main/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource>  - <directory>${basedir}/../dvdstore-ear/src/main/application</directory> - <filtering>true</filtering> - </testResource> - <testResource>  - <directory>${basedir}/../dvdstore-web/src/main/resources</directory> - <filtering>true</filtering> - </testResource> - </testResources> - <plugins> + <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - <plugin> <artifactId>maven-clean-plugin</artifactId> <configuration> <filesets> @@ -143,21 +143,9 @@ <example.context.path>seam-dvdstore</example.context.path> </properties> <build> - <plugins> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../dvdstore-ear/src/main/resources/jboss-seam-dvdstore-ds.xml</param> - <param>${basedir}/../dvdstore-ear/target/seam-dvdstore.ear</param> - </fileNames> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>selenium-maven-plugin</artifactId> </plugin> <plugin> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java 2012-03-14 17:51:00 UTC (rev 14403) @@ -1,20 +1,41 @@ package com.jboss.dvd.seam.test; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertTrue; - +import java.io.File; import java.math.BigDecimal; import java.util.List; -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.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.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; import com.jboss.dvd.seam.Product; +(a)RunWith(Arquillian.class) public class BestSellersTest - extends SeamTest + extends JUnitSeamTest { + + @Deployment(name = "BestSellersTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war"); + web.addClasses(BestSellersTest.class); + + return er; + } + + @Test public void testTopProducts() throws Exception @@ -26,24 +47,22 @@ { List<Product> products = (List<Product>) getValue("#{topProducts}"); - assertNotNull("topProducts", products); - assertEquals("topProducts size", 8, products.size()); + Assert.assertNotNull("topProducts", products); + Assert.assertEquals("topProducts size", 8, products.size()); Product prev = null; for (Product p: products) { if (prev != null) { - assertTrue("descending order", + Assert.assertTrue("descending order", p.getInventory().getSales() <= prev.getInventory().getSales()); } prev = p; } - // 14.98/29.99/39.95 - - assertEquals("price 1", new BigDecimal("14.98"), products.get(0).getPrice()); - assertEquals("price 2", new BigDecimal("29.99"), products.get(1).getPrice()); - assertEquals("price 3", new BigDecimal("39.95"), products.get(2).getPrice()); + Assert.assertEquals("price 1", new BigDecimal("14.98"), products.get(0).getPrice()); + Assert.assertEquals("price 2", new BigDecimal("29.99"), products.get(1).getPrice()); + Assert.assertEquals("price 3", new BigDecimal("39.95"), products.get(2).getPrice()); } }.run(); } Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java 2012-03-14 17:51:00 UTC (rev 14403) @@ -1,27 +1,49 @@ package com.jboss.dvd.seam.test; +import java.io.File; import java.util.ArrayList; import java.util.List; import javax.el.ELException; import javax.faces.model.DataModel; +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.Conversation; -import org.jboss.seam.mock.SeamTest; +import org.jboss.seam.mock.JUnitSeamTest; import org.jboss.seam.security.NotLoggedInException; -import org.testng.annotations.Test; +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.junit.Test; +import org.junit.runner.RunWith; import com.jboss.dvd.seam.Order; +import com.jboss.dvd.seam.Order.Status; import com.jboss.dvd.seam.Product; import com.jboss.dvd.seam.ShoppingCart; import com.jboss.dvd.seam.User; -import com.jboss.dvd.seam.Order.Status; +(a)RunWith(Arquillian.class) public class OrderTest - extends SeamTest + extends JUnitSeamTest { + + @Deployment(name = "OrderTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war"); + web.addClasses(OrderTest.class); + + return er; + } - @Test + @Test public void selectDvd() throws Exception { Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java 2012-03-14 17:51:00 UTC (rev 14403) @@ -1,24 +1,41 @@ package com.jboss.dvd.seam.test; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; -import static org.testng.AssertJUnit.assertTrue; -import static org.testng.AssertJUnit.fail; +import java.io.File; import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; import javax.persistence.PersistenceException; -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.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.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; import com.jboss.dvd.seam.Product; +(a)RunWith(Arquillian.class) public class ProductUnitTest - extends SeamTest + extends JUnitSeamTest { + + @Deployment(name = "ProductUnitTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war"); + web.addClasses(ProductUnitTest.class); + + return er; + } + @Test public void testRequiredAttributes() throws Exception @@ -34,7 +51,7 @@ EntityManager em = (EntityManager) getValue("#{entityManager}"); try { em.persist(p); - fail("empty product persisted"); + Assert.fail("empty product persisted"); } catch (PersistenceException e) { // good } @@ -64,9 +81,9 @@ { EntityManager em = (EntityManager) getValue("#{entityManager}"); Product found = em.find(Product.class ,p.getProductId()); - assertNotNull("find by id", found); - assertEquals("id", p.getProductId(), found.getProductId()); - assertEquals("title", "test", found.getTitle()); + Assert.assertNotNull("find by id", found); + Assert.assertEquals("id", p.getProductId(), found.getProductId()); + Assert.assertEquals("title", "test", found.getTitle()); em.remove(found); } @@ -78,7 +95,7 @@ EntityManager em = (EntityManager) getValue("#{entityManager}"); Product found = em.find(Product.class ,p.getProductId()); - assertNull("deleted product", found); + Assert.assertEquals("deleted product", found); } }.run(); Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java 2012-03-14 17:51:00 UTC (rev 14403) @@ -1,19 +1,41 @@ package com.jboss.dvd.seam.test; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertTrue; +import java.io.File; + import javax.faces.model.ListDataModel; -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.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.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; import com.jboss.dvd.seam.FullTextSearch; import com.jboss.dvd.seam.Product; +(a)RunWith(Arquillian.class) public class SearchTest - extends SeamTest + extends JUnitSeamTest { + @Deployment(name = "SearchTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war"); + web.addClasses(SearchTest.class); + + return er; + } + @Test public void testNoParamSearch() throws Exception @@ -31,7 +53,7 @@ protected void invokeApplication() { String outcome = search.doSearch(); - assertEquals("search outcome", "browse", outcome); + Assert.assertEquals("search outcome", "browse", outcome); } @Override protected void renderResponse() @@ -39,11 +61,11 @@ ListDataModel model = (ListDataModel) lookup("searchResults"); //exact number of matches depends on search algorithm, //so we only check that at least something was found: - assertTrue("should have found something",model.isRowAvailable()); + Assert.assertEquals("should have found something",model.isRowAvailable()); Product firstMatch = (Product) model.getRowData(); - assertTrue("at least top match should have keyword in title", + Assert.assertEquals("at least top match should have keyword in title", firstMatch.getTitle().toLowerCase().contains("king")); - assertTrue("in conversation", isLongRunningConversation()); + Assert.assertEquals("in conversation", isLongRunningConversation()); } }.run(); } Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java 2012-03-14 17:51:00 UTC (rev 14403) @@ -1,17 +1,39 @@ package com.jboss.dvd.seam.test; -import static org.testng.AssertJUnit.assertEquals; - +import java.io.File; import java.math.BigDecimal; -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.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.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; import com.jboss.dvd.seam.StoreManager; +(a)RunWith(Arquillian.class) public class StoreManagerTest - extends SeamTest + extends JUnitSeamTest { + + @Deployment(name = "StoreManagerTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war"); + web.addClasses(StoreManagerTest.class); + + return er; + } + @Test public void testTopProducts() throws Exception @@ -28,12 +50,12 @@ protected void renderResponse() { // these are from order instances - - assertEquals("number orders", 0L, manager.getNumberOrders()); - assertEquals("total sales", BigDecimal.ZERO, manager.getTotalSales()); + Assert.assertEquals("number orders", 0L, manager.getNumberOrders()); + Assert.assertEquals("total sales", BigDecimal.ZERO, manager.getTotalSales()); // these are from inventory - assertEquals("units sold", 5734, manager.getUnitsSold()); - assertEquals("total inventory", 23432, manager.getTotalInventory()); + Assert.assertEquals("units sold", 5734, manager.getUnitsSold()); + Assert.assertEquals("total inventory", 23432, manager.getTotalInventory()); } }.run(); } Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources/WEB-INF/components.xml 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources/WEB-INF/components.xml 2012-03-14 17:51:00 UTC (rev 14403) @@ -14,7 +14,7 @@ http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> - <core:init debug="true" jndi-pattern="#{ejbName}/local"/> + <core:init debug="true" jndi-pattern="java:app/dvdstore-ejb/#{ejbName}"/>  <core:manager conversation-timeout="120000"/> Added: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/arquillian.xml 2012-03-14 17:51:00 UTC (rev 14403) @@ -0,0 +1,17 @@ +<?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> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/testng.xml 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/testng.xml 2012-03-14 17:51:00 UTC (rev 14403) @@ -1,27 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > -<suite name="DVD Store" verbose="2" parallel="false"> - <test name="DVD Store Model Unit Tests"> - <classes> - <class name="com.jboss.dvd.seam.test.ProductUnitTest" /> - </classes> - </test> - - <test name="DVD Store Store Beans"> - <classes> - <class name="com.jboss.dvd.seam.test.SearchTest"/> - <class name="com.jboss.dvd.seam.test.BestSellersTest"/> - </classes> - </test> - - <test name="DVD Store Admin Beans"> - <classes> - <class name="com.jboss.dvd.seam.test.StoreManagerTest"/> - </classes> - </test> - - <test name="DVD Store Order"> - <classes> - <class name="com.jboss.dvd.seam.test.OrderTest" /> - </classes> - </test> -</suite> Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:51:00 UTC (rev 14403) @@ -16,6 +16,7 @@ <modules> <module>booking</module> + <module>dvdstore</module> <module>mail</module> <module>messages</module> <module>todo</module>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14402 - in branches/community/Seam_2_3/examples-ee6: ui and 36 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:50:07 -0400 (Wed, 14 Mar 2012) New Revision: 14402 Added: branches/community/Seam_2_3/examples-ee6/ui/ branches/community/Seam_2_3/examples-ee6/ui/pom.xml branches/community/Seam_2_3/examples-ee6/ui/readme.txt branches/community/Seam_2_3/examples-ee6/ui/ui-ds.cli branches/community/Seam_2_3/examples-ee6/ui/ui-ear/ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/main/ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/main/application/ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/main/application/META-INF/ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeConverter.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeList.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Animal.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AnimalList.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Book.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/BookPk.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/ButtonLinkBean.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Colour.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Continent.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Country.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/EqualityValidatorBean.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Factories.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Film.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/FilmConverter.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Person.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Picture.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Resources.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/SpanTitle.java branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/META-INF/ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/import.sql branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/ui/ui-tests/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/htmlunit/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/htmlunit/HtmlUnitUITest.java branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/selenium/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/selenium/SeleniumUITest.java branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/photo.jpg branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/ui.properties branches/community/Seam_2_3/examples-ee6/ui/ui-web/ branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/resources/ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/resources/messages_en.properties branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/cache.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/date.css branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/decorateField.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/dtpick.gif branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidator.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidatorWConvert.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fileUpload.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/formattedText.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fragment.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/graphicImage.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/linkAndButton.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resource.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resources.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml Modified: branches/community/Seam_2_3/examples-ee6/pom.xml Log: JBSEAM-4852 add the ui example add the ui example Conflicts: examples-ee6/ui/readme.txt examples-ee6/ui/ui-ear/pom.xml examples-ee6/ui/ui-ear/src/main/application/META-INF/jboss-deployment-structure.xml examples-ee6/ui/ui-ejb/pom.xml examples-ee6/ui/ui-web/src/main/webapp/cache.xhtml ui example cleanup add ui example to the examples-ee6 module Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:48:19 UTC (rev 14401) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -19,6 +19,7 @@ <module>mail</module> <module>messages</module> <module>todo</module> + <module>ui</module> </modules> <build> Added: branches/community/Seam_2_3/examples-ee6/ui/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,49 @@ +<?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"> + <parent> + <artifactId>examples-ee6</artifactId> + <groupId>org.jboss.seam</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui</artifactId> + <packaging>pom</packaging> + <name>UI Example (EE6)</name> + + <modules> + <module>ui-ejb</module> + <module>ui-web</module> + <module>ui-ear</module> + <module>ui-tests</module> + </modules> + + <properties> + <example.name>ui</example.name> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-ear</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Added: branches/community/Seam_2_3/examples-ee6/ui/readme.txt =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/readme.txt 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,25 @@ +Seam UI Example +=============== + +This is a simple example demonstrating Seam UI. It runs on JBoss +AS7 as an EAR + +To deploy the example to JBoss AS7, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* Start the AS7 up. + +* In the ui-ear directory run the following to create a ui datasource: + + $JBOSS_HOME/bin/jboss-cli.sh --file=ui-ds.cli + +* Deploy the sample: + + $JBOSS_HOME/bin/jboss-cli.sh --connect 'deploy ui-ear/target/seam-ui.ear' + +* Open this URL in a web browser: http://localhost:8080/seam-ui Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ds.cli =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ds.cli (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ds.cli 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,3 @@ +connect +data-source add --name=uiDS --jndi-name=java:/uiDatasource --connection-url=jdbc:h2:mem:test;DB_CLOSE_DELAY=-1 --user-name=sa --password=sa --driver-name=h2 +/subsystem=datasources/data-source="uiDS":enable Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,105 @@ +<?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>ui</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>ui-ear</artifactId> + <packaging>ear</packaging> + <name>UI EAR Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-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> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-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>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + + <build> + <finalName>seam-ui</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <version>6</version> + <defaultLibBundleDir>lib</defaultLibBundleDir> +  + <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> +  + <generateApplicationXml>true</generateApplicationXml> + <filtering>true</filtering> + <modules> + <webModule> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-web</artifactId> + <contextRoot>/seam-ui</contextRoot> + <bundleFileName>ui-web.war</bundleFileName> + </webModule> + <ejbModule> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-ejb</artifactId> + <bundleFileName>ui-ejb.jar</bundleFileName> + </ejbModule> + <ejbModule> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <bundleFileName>jboss-seam.jar</bundleFileName> + </ejbModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,9 @@ +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> + <deployment> + <dependencies> + <module name="org.antlr" export="true"/> + <module name="org.dom4j" export="true"/> + <module name="javax.faces.api" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,41 @@ +<?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>ui</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>ui-ejb</artifactId> + <packaging>ejb</packaging> + <name>UI EJB Module</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> +  + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.1.Final</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeConverter.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeConverter.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeConverter.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,26 @@ +package org.jboss.seam.example.ui; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.ConverterException; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.annotations.faces.Converter; + +@Name("ageConverter") +@BypassInterceptors +@Converter +public class AgeConverter implements javax.faces.convert.Converter +{ + public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException + { + Integer i = new Integer(value); + return i.intValue(); + } + + public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException + { + return value + ""; + } +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeList.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeList.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AgeList.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,16 @@ +package org.jboss.seam.example.ui; + +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.Name; + +@Name("ageList") +public class AgeList +{ + + @Factory("ages") + public int[] getAges() { + int[] ages = {18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30}; + return ages; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Animal.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Animal.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Animal.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,32 @@ +package org.jboss.seam.example.ui; + +public class Animal +{ + + public static Animal DOG = new Animal("Needs lots of exercise", "Dog"); + public static Animal CAT = new Animal("Looks after itself", "Cat"); + public static Animal GOLDFISH = new Animal("Needs a fishtank!", "Goldfish"); + public static Animal RABBIT = new Animal("Often has floppy ears", "Rabbit"); + public static Animal SNAKE = new Animal("Better make sure it doesn't bite you", "Snake"); + public static Animal PARROT = new Animal("Peices of Eight", "Parrot"); + + private String notes; + private String name; + + public Animal(String notes, String name) + { + this.notes = notes; + this.name = name; + } + + public String getNotes() + { + return notes; + } + + public String getName() + { + return name; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AnimalList.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AnimalList.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/AnimalList.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,32 @@ +package org.jboss.seam.example.ui; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Unwrap; + +@Name("animals") +public class AnimalList +{ + + private List<Animal> animals; + + @Unwrap + public List<Animal> unwrap() + { + if (animals == null) + { + animals = new ArrayList<Animal>(); + animals.add(Animal.CAT); + animals.add(Animal.DOG); + animals.add(Animal.GOLDFISH); + animals.add(Animal.PARROT); + animals.add(Animal.RABBIT); + animals.add(Animal.SNAKE); + } + return animals; + } + + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Book.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Book.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Book.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,32 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; + +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; + +@Entity +public class Book implements Serializable +{ + + @EmbeddedId + private BookPk bookPk = new BookPk(); + + private String nationality; + + public String getName() + { + return bookPk.getName(); + } + + public String getAuthor() + { + return bookPk.getAuthor(); + } + + public String getNationality() + { + return nationality; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/BookPk.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/BookPk.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/BookPk.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,48 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; + +import javax.persistence.Embeddable; + +@Embeddable +public class BookPk implements Serializable +{ + + private String name; + + private String author; + + protected BookPk() + { + } + + public BookPk(String name, String author) + { + this.name = name; + this.author = author; + } + + public String getName() + { + return name; + } + + public String getAuthor() + { + return author; + } + + @Override + public boolean equals(Object other) + { + if (other instanceof BookPk) + { + BookPk that = (BookPk) other; + return this.getAuthor().equals(that.getAuthor()) && this.getName().equals(that.getName()); + } + else + { + return false; + } + } +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/ButtonLinkBean.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/ButtonLinkBean.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/ButtonLinkBean.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,33 @@ +package org.jboss.seam.example.ui; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.faces.FacesMessages; + +@Name("buttonLink") +public class ButtonLinkBean +{ + private String foo; + + public void simpleAction() + { + if (foo != null) + { + FacesMessages.instance().add("Foo = " + foo); + } + else + { + FacesMessages.instance().add("A simple action was performed"); + } + } + + public void setFoo(String foo) + { + this.foo = foo; + } + + public String getFoo() + { + return foo; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Colour.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Colour.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Colour.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,45 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToMany; + +@Entity +public class Colour implements Serializable +{ + + @ManyToMany(mappedBy="favouriteColours") + private List<Person> people; + + @Id @GeneratedValue + private Integer id; + + private String name; + + public Integer getId() + { + return id; + } + + public void setId(Integer id) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Continent.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Continent.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Continent.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,52 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToMany; + +@Entity +public class Continent implements Serializable +{ + @Id @GeneratedValue + private Integer id; + + private String name; + + @OneToMany(mappedBy="continent") + private List<Country> countries; + + public List<Country> getCountries() + { + return countries; + } + + public void setCountries(List<Country> countries) + { + this.countries = countries; + } + + public Integer getId() + { + return id; + } + + public void setId(Integer id) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Country.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Country.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Country.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,54 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class Country implements Serializable +{ + + @Id @GeneratedValue + private Integer id; + + private String name; + + @ManyToOne + private Continent continent; + + public Continent getContinent() + { + return continent; + } + + public void setContinent(Continent continent) + { + this.continent = continent; + } + + public Integer getId() + { + return id; + } + + public void setId(Integer id) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/EqualityValidatorBean.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/EqualityValidatorBean.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/EqualityValidatorBean.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,82 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; +import java.util.Date; + +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.international.StatusMessages; +import org.jboss.seam.international.StatusMessage.Severity; +import org.jboss.seam.util.Strings; + +@Name("equalityValidatorBean") +(a)Scope(ScopeType.SESSION) +public class EqualityValidatorBean implements Serializable +{ + + @In + private StatusMessages statusMessages; + + private String name; + + private Long age; + + private Date date; + + public void check() + { + if (Strings.isEmpty(name)) + { + statusMessages.addToControl("name", Severity.WARN, "Enter a name!"); + } + else + { + statusMessages.addToControl("name", Severity.INFO, "OK!"); + } + } + + public void checkDate() + { + if (date == null) + { + statusMessages.addToControl("date", Severity.WARN, "Enter a date!"); + } + else + { + statusMessages.addToControl("date", Severity.INFO, "OK!"); + } + } + + public Date getDate() + { + return date; + } + + public void setDate(Date date) + { + this.date = date; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public Long getAge() + { + return age; + } + + public void setAge(Long age) + { + this.age = age; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Factories.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Factories.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Factories.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,21 @@ +package org.jboss.seam.example.ui; + +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.example.ui.Person.Honorific; +import org.jboss.seam.example.ui.Person.Role; + +@Name("factories") +public class Factories +{ + @Factory("honorifics") + public Honorific[] getHonorifics() { + return Honorific.values(); + } + + @Factory("roles") + public Role[] getRoles() { + return Role.values(); + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Film.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Film.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Film.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,52 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +@Entity +public class Film implements Serializable +{ + + @Id @GeneratedValue + private Integer id; + + private String name; + + private String director; + + public String getDirector() + { + return director; + } + + public void setDirector(String director) + { + this.director = director; + } + + public Integer getId() + { + return id; + } + + public void setId(Integer id) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/FilmConverter.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/FilmConverter.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/FilmConverter.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,53 @@ +package org.jboss.seam.example.ui; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.persistence.EntityManager; + +import org.jboss.seam.Component; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.faces.Converter; +import org.jboss.seam.annotations.intercept.BypassInterceptors; + +@Name("filmConverter") +@Converter(forClass = Film.class) +@BypassInterceptors +public class FilmConverter implements javax.faces.convert.Converter +{ + + public Object getAsObject(FacesContext context, UIComponent component, String value) + { + + EntityManager entityManager = (EntityManager) Component.getInstance("entityManager"); + + if (value != null) + { + try + { + Integer id = Integer.parseInt(value); + if (id != null) + { + return entityManager.find(Film.class, id); + } + } + catch (NumberFormatException e) + { + } + } + return null; + } + + public String getAsString(FacesContext context, UIComponent component, Object value) + { + if (value instanceof Film) + { + Film film = (Film) value; + return film.getId().toString(); + } + else + { + return null; + } + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Person.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Person.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Person.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,235 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.CascadeType; +import javax.persistence.ElementCollection; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.validation.constraints.Size; + +@Entity +public class Person implements Serializable +{ + + public enum Honorific { + + MR("Mr."), + MRS("Mrs."), + MISS("Miss."), + MS("Ms."), + DOCTOR("Dr."); + + private String label; + + Honorific(String label) + { + this.label = label; + } + + public String getLabel() + { + return label; + } + } + + public enum Role + { + USER, + ADMIN, + MANAGER, + SUPERADMIN; + + public String getName() + { + return this.name(); + } + } + + @Id @GeneratedValue + private Integer id; + + @Size(min=5) + private String name; + + // A wikitext string + private String hobbies; + + @ManyToOne + private Country country; + + @ManyToOne + private Continent continent; + + @Enumerated(EnumType.STRING) + private Honorific honorific; + + private int age; + + @ManyToMany + private List<Colour> favouriteColours; + + @ManyToOne(fetch=FetchType.LAZY) + private Book favouriteBook; + + @OneToOne(cascade=CascadeType.ALL) + private Picture picture; + + @ElementCollection + private List<Role> roles = new ArrayList<Role>(); + + private String pet; + + + + @ManyToOne + private Film favouriteFilm; + + public Person() + { + picture = new Picture(); + } + + public List<Role> getRoles() + { + return roles; + } + + public void setRoles(List<Role> roles) + { + this.roles = roles; + } + + public Country getCountry() + { + return country; + } + + public void setCountry(Country country) + { + this.country = country; + } + + public Integer getId() + { + return id; + } + + public void setId(Integer id) + { + this.id = id; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public int getAge() + { + return age; + } + + public void setAge(int age) + { + this.age = age; + } + + public Continent getContinent() + { + return continent; + } + + public void setContinent(Continent continent) + { + this.continent = continent; + } + + public Honorific getHonorific() + { + return honorific; + } + + public void setHonorific(Honorific honorific) + { + this.honorific = honorific; + } + + public List<Colour> getFavouriteColours() + { + return favouriteColours; + } + + public void setFavouriteColours(List<Colour> favouriteColours) + { + this.favouriteColours = favouriteColours; + } + + public Book getFavouriteBook() + { + return favouriteBook; + } + + public void setFavouriteBook(Book favouriteBook) + { + this.favouriteBook = favouriteBook; + } + + public String getHobbies() + { + return hobbies; + } + + public void setHobbies(String hobbies) + { + this.hobbies = hobbies; + } + + public Picture getPicture() + { + if (picture == null) + { + picture = new Picture(); + } + return picture; + } + + public void setPicture(Picture picture) + { + this.picture = picture; + } + + public String getPet() + { + return pet; + } + + public void setPet(String pet) + { + this.pet = pet; + } + + public Film getFavouriteFilm() + { + return favouriteFilm; + } + + public void setFavouriteFilm(Film favouriteFilm) + { + this.favouriteFilm = favouriteFilm; + } +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Picture.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Picture.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Picture.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,80 @@ +package org.jboss.seam.example.ui; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.OneToOne; + +import org.jboss.seam.annotations.Name; + +@Entity +@Name("memberImage") +public class Picture implements Serializable +{ + private static final long serialVersionUID = -8088455267213832920L; + + @Id @GeneratedValue + private Integer id; + + @OneToOne(mappedBy="picture") + private Person person; + private byte[] data; + private String contentType; + private String fileName; + + + public Integer getId() + { + return id; + } + + public void setId(Integer imageId) + { + this.id = imageId; + } + + + public Person getPerson() + { + return person; + } + + public void setPerson(Person person) + { + this.person = person; + } + + public String getContentType() + { + return contentType; + } + + public void setContentType(String contentType) + { + this.contentType = contentType; + } + + @Lob + public byte[] getData() + { + return data; + } + + public void setData(byte[] data) + { + this.data = data; + } + + public String getFileName() + { + return fileName; + } + + public void setFileName(String fileName) + { + this.fileName = fileName; + } +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Resources.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Resources.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/Resources.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,94 @@ +package org.jboss.seam.example.ui; + +import java.io.ByteArrayInputStream; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.web.RequestParameter; + +@Name("resources") +(a)Scope(ScopeType.EVENT) +public class Resources +{ + + @RequestParameter + private int id; + + private ResourceItem item; + + @Create + public void create() + { + switch (id) + { + case 1: + item = new ResourceItem("text.txt", new byte[] { 'a', 'b', 'c' }, null, "text/plain"); + break; + case 2: + ByteArrayInputStream str = new ByteArrayInputStream(new byte[] { '1', '2', '3' }); + item = new ResourceItem("numbers.txt", str, null, "text/plain"); + break; + } + } + + public static class ResourceItem + { + + public ResourceItem(String fileName, Object data, String disposition, String contentType) + { + this.fileName = fileName; + this.data = data; + this.disposition = disposition; + this.contentType = contentType; + } + + public String fileName; + public Object data; + public String disposition; + public String contentType; + + public String getFileName() + { + return fileName; + } + + public Object getData() + { + return data; + } + + public String getDisposition() + { + return disposition; + } + + public String getContentType() + { + return contentType; + } + + } + + public int getId() + { + return id; + } + + public void setId(int id) + { + this.id = id; + } + + public ResourceItem getItem() + { + return item; + } + + public void setItem(ResourceItem item) + { + this.item = item; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/SpanTitle.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/SpanTitle.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/java/org/jboss/seam/example/ui/SpanTitle.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,16 @@ +package org.jboss.seam.example.ui; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Unwrap; + +@Name("spanTitle") +public class SpanTitle +{ + + @Unwrap + public String unwrap() + { + return "A Span title"; + } + +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/META-INF/persistence.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,15 @@ +<?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="uiDatabase"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:/uiDatasource</jta-data-source> + <properties> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="jboss.entity.manager.factory.jndi.name" value="java:/uiEntityManagerFactory"/> + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/import.sql 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,36 @@ +insert into person (id, name, age, hobbies) values (1, 'Peter Muir', 25, '*works on Seam*, *of course*'); +insert into continent(id, name) values(1, 'North America'); +insert into continent(id, name) values(2, 'South America'); +insert into continent(id, name) values(3, 'Australasia'); +insert into continent(id, name) values(4, 'Europe'); +insert into continent(id, name) values(5, 'Asia'); +insert into continent(id, name) values(6, 'Africa'); +insert into continent(id, name) values(7, 'Antartica'); + +insert into country (id, name, continent_id) values (1, 'USA', 1); +insert into country (id, name, continent_id) values (2, 'Canada', 1); +insert into country (id, name, continent_id) values (3, 'United Kingdom', 4); +insert into country (id, name, continent_id) values (4, 'France', 4); +insert into country (id, name, continent_id) values (5, 'Germany', 4); +insert into country (id, name, continent_id) values (6, 'Spain', 4); +insert into country (id, name, continent_id) values (7, 'Australia', 3); +insert into country (id, name, continent_id) values (8, 'Chile', 2); +insert into country (id, name, continent_id) values (9, 'China', 5); +insert into country (id, name, continent_id) values (10, 'South Africa', 6); + +insert into colour(id, name) values (1, 'Red') +insert into colour(id, name) values (2, 'Blue') +insert into colour(id, name) values (3, 'Green') +insert into colour(id, name) values (4, 'Purple') +insert into colour(id, name) values (5, 'Yellow') +insert into colour(id, name) values (6, 'Orange') + +insert into book(name,author,nationality) values ('Pride and Prejudice', 'Jane Austin', 'British') +insert into book(name,author,nationality) values ('The Great Gatsby', 'F. Scott Fitzgerald', 'American') +insert into book(name,author,nationality) values ('Romeo and Juliet', 'William Shakespeare', 'British') +insert into book(name,author,nationality) values ('The Illiad', 'Homer', 'Ancient Greek') + +insert into film(id,name,director) values (1, 'Blade Runner', 'Ridley Scott') +insert into film(id,name,director) values (2, 'E.T.', 'Steven Spielberg') +insert into film(id,name,director) values (3, 'Star Wars', 'George Lucas') +insert into film(id,name,director) values (4, 'Jay and Silent Bob Strike Back', 'Kevin Smith') Added: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/src/main/resources/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,128 @@ +<?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>ui</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</groupId> + <artifactId>ui-tests</artifactId> + <name>UI Integration Tests Module</name> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-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>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <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>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>2.3</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> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>ftest-jbossas</id> + <properties> + <example.context.path>seam-ui</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> + <profile> + <id>ftest-tomcat</id> + <properties> + <example.context.path>jboss-seam-ui</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/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/htmlunit/HtmlUnitUITest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/htmlunit/HtmlUnitUITest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/htmlunit/HtmlUnitUITest.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,122 @@ +/* + * 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.ui.test.htmlunit; + +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertFalse; + +import java.io.IOException; + +import com.gargoylesoftware.htmlunit.WebClient; +import com.gargoylesoftware.htmlunit.BrowserVersion; +import com.gargoylesoftware.htmlunit.html.HtmlPage; +import com.gargoylesoftware.htmlunit.html.HtmlElement; +import com.gargoylesoftware.htmlunit.html.HtmlInput; +import com.gargoylesoftware.htmlunit.html.HtmlAnchor; +import com.gargoylesoftware.htmlunit.html.HtmlImage; +import static org.testng.AssertJUnit.fail; +import java.net.URL; + +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Functional test for uploadLink and graphicImage testcases of UI example + * + * @author mgencur + * + */ +public class HtmlUnitUITest +{ + public static final String PAGE_URL = "http://localhost:8080/seam-ui"; + public static final String HOME_PAGE_TITLE = "UI Example:"; + public static final String FILE_UPLOAD_FILE= "//input[@type='file']"; + public static final String FILE_UPLOAD_UPDATE="//input[@type='submit'][@value='Update']"; + public static final String IMAGE_TO_UPLOAD = "photo.jpg"; + public static final String FILE_UPLOAD_RESPONSE="//ul/li[contains(text(),'Successfully updated')]"; + public static final String FILE_UPLOAD_LINK = "//a[contains(@href,'fileUpload')]"; + public static final String GRAPHIC_IMAGE_LINK = "//a[contains(@href,'graphicImage')]"; + public static final String IMAGE = "//img"; + + public WebClient wc; + public HtmlPage page; + + @BeforeMethod + public void setUp() throws Exception{ + URL url = new URL(PAGE_URL); + wc = new WebClient(BrowserVersion.FIREFOX_2); + page = (HtmlPage) wc.getPage(url); + } + + + @AfterMethod + public void tearDown() { + wc.closeAllWindows(); + } + + + @Test + public void homePageLoadTest() + { + assertEquals("Unexpected page title.", HOME_PAGE_TITLE, page.getTitleText()); + } + + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void fileUploadTest() throws IOException { + final HtmlAnchor linkEl = (HtmlAnchor) page.getFirstByXPath(FILE_UPLOAD_LINK); + + final HtmlPage uploadPage = (HtmlPage) linkEl.click(); + if (uploadPage == null){ + fail("Could not read page"); + } + + final HtmlInput el1 = (HtmlInput) uploadPage.getFirstByXPath(FILE_UPLOAD_FILE); + if (el1 == null) { + fail("Element file upload file doesn't exist"); + } else { + el1.type(IMAGE_TO_UPLOAD); + } + + final HtmlInput el2 = (HtmlInput) uploadPage.getFirstByXPath(FILE_UPLOAD_UPDATE); + final HtmlPage finishPage = (HtmlPage) el2.click(); + final HtmlElement el3 = (HtmlElement) finishPage.getFirstByXPath(FILE_UPLOAD_RESPONSE); + + assertFalse("Page should contain \"Successfully updated\"", el3 == null); + } + + + @Test(dependsOnMethods={"homePageLoadTest","fileUploadTest"}) + public void graphicImageTest() throws IOException { + final HtmlAnchor linkEl = (HtmlAnchor) page.getFirstByXPath(GRAPHIC_IMAGE_LINK); + + final HtmlPage graphicPage = (HtmlPage) linkEl.click(); + if (graphicPage == null){ + fail("Could not read page"); + } + + final HtmlImage image = (HtmlImage) graphicPage.getFirstByXPath(IMAGE); + + assertFalse("Page should contain image of Pete Muir", image == null); + } +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/selenium/SeleniumUITest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/selenium/SeleniumUITest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/java/org/jboss/seam/example/ui/test/selenium/SeleniumUITest.java 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,220 @@ +/* + * 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.ui.test.selenium; + +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; + +import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * This class tests functionality of UI example + * + * @author Martin Gencur + * + */ +public class SeleniumUITest extends SeamSeleniumTest +{ + public static final String HOME_PAGE = "/index.seam"; + public static final String HOME_PAGE_TITLE = "UI Example:"; + public static final String SELECT_ITEMS_LINK = "xpath=//a[contains(@href,\"selectItems\")]"; + public static final String FRAGMENT_LINK = "xpath=//a[contains(@href,\"fragment\")]"; + public static final String FOTMATTED_TEXT_LINK = "xpath=//a[contains(@href,\"formattedText\")]"; + public static final String BUTTON_AND_SLINK_LINK = "xpath=//a[contains(@href,\"linkAndButton\")]"; + public static final String CACHE_LINK = "xpath=//a[contains(@href,\"cache\")]"; + public static final String VALIDATE_EQUALITY_LINK = "xpath=//a[contains(@href,\"equalityValidator\")]"; + public static final String VALIDATE_EQUALITY2_LINK = "xpath=//a[contains(@href,\"equalityValidatorWConvert\")]"; + public static final String RESOURCE_DOWNLOAD_LINK = "xpath=//a[contains(@href,\"resource\")]"; + + @BeforeMethod + @Override + public void setUp() + { + super.setUp(); + browser.open(CONTEXT_PATH + HOME_PAGE); + } + + /** + * Place holder - just verifies that example deploys + */ + @Test + public void homePageLoadTest() + { + assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle()); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void selectItemsTest(){ + String title = "Mr."; + String name = "Martin Gencur"; + String continent = "Europe"; + String age = "24"; + String pet = "Dog (Needs lots of exercise)"; + String colour1 = "Green", colour2 = "Yellow"; + String book = "Pride and Prejudice by Jane Austin (British)"; + String film = "Blade Runner directed by Ridley Scott"; + browser.clickAndWait(SELECT_ITEMS_LINK); + browser.select(getProperty("SELECT_ITEMS_TITLE"), "label="+title); + browser.type(getProperty("SELECT_ITEMS_NAME"), name); + browser.select(getProperty("SELECT_ITEMS_CONTINENT"), "label="+continent); + browser.check(getProperty("SELECT_ITEMS_USER")); + browser.check(getProperty("SELECT_ITEMS_ADMIN")); + browser.check(getProperty("SELECT_ITEMS_MANAGER")); + browser.check(getProperty("SELECT_ITEMS_SUPERADMIN")); + browser.select(getProperty("SELECT_ITEMS_AGE"), "label="+age); + browser.select(getProperty("SELECT_ITEMS_PET"), "label="+pet); + browser.select(getProperty("SELECT_ITEMS_COLOURS"), "label="+colour1); + browser.select(getProperty("SELECT_ITEMS_COLOURS"), "label="+colour2); + browser.select(getProperty("SELECT_ITEMS_BOOK"), "label="+book); + browser.select(getProperty("SELECT_ITEMS_FILM"), "label="+film); + browser.clickAndWait(getProperty("SELECT_ITEMS_APPLY")); + browser.check(getProperty("SELECT_ITEMS_COUNTRY")); + browser.clickAndWait(getProperty("SELECT_ITEMS_APPLY")); + assertTrue("Page should contain \"Successfully updated\"", browser.isTextPresent("Successfully updated")); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void fragmentTest(){ + browser.clickAndWait(FRAGMENT_LINK); + assertTrue("Page should contain \"fragment is rendered\"", browser.isTextPresent("This fragment is rendered whilst")); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void formattedTextTest(){ + browser.clickAndWait(FOTMATTED_TEXT_LINK); + assertTrue("Page should contain information about Pete Muir working all the time on Seam", browser.isTextPresent("works on Seam, of course")); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void buttonAndLinkTest(){ + browser.clickAndWait(BUTTON_AND_SLINK_LINK); + assertTrue("Page should contain \"A fragment to jump to\"", browser.isTextPresent("A fragment to jump to")); + browser.clickAndWait(getProperty("JUMP_LINK")); + browser.clickAndWait(getProperty("JUMP_BUTTON")); + browser.clickAndWait(getProperty("LINK_LINK")); + browser.clickAndWait(getProperty("DO_ACTION_LINK")); + assertTrue("Page should contain \"A simple action was performed\"", browser.isTextPresent("A simple action was performed")); + browser.clickAndWait(getProperty("DO_ACTION_BUTTON")); + assertTrue("Page should contain \"A simple action was performed\"", browser.isTextPresent("A simple action was performed")); + assertTrue("Page should contain disabled link", browser.isElementPresent(getProperty("DISABLED_DO_ACTION_LINK"))); + assertTrue("Page should contain disabled button", browser.isElementPresent(getProperty("DISABLED_DO_ACTION_BUTTON"))); + browser.clickAndWait(getProperty("BEGIN_CONVERSATION_LINK")); + browser.clickAndWait(getProperty("END_CONVERSATION_BUTTON")); + assertTrue("Page shouldn't contain \"A simple action was performed\"", !browser.isTextPresent("A simple action was performed")); + browser.clickAndWait(getProperty("ADD_PARAMETER_LINK")); + browser.clickAndWait(getProperty("ADD_PARAMETER_BUTTON")); + assertTrue("Page should contain \"Foo = bar\"", browser.isTextPresent("Foo = bar")); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void cacheTest(){ + browser.clickAndWait(CACHE_LINK); + assertTrue("Page should contain some cached text", browser.isTextPresent("Some cached text")); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void validateEqualityTest(){ + String name1 = "martin"; + String name2 = "peter"; + String age1 = "20"; + String age2 = "30"; + browser.clickAndWait(VALIDATE_EQUALITY_LINK); + + browser.type(getProperty("NAME_INPUT"), name1); + browser.type(getProperty("NAME_VERIFICATION_INPUT"), name1); + browser.clickAndWait(getProperty("CHECK_NAME_BUTTON")); + assertTrue("Page should contain \"OK!\""+ "je tam:" + browser.getBodyText(), browser.isTextPresent("OK!")); + + browser.type(getProperty("NAME_INPUT"), name1); + browser.type(getProperty("NAME_VERIFICATION_INPUT"), name2); + browser.clickAndWait(getProperty("CHECK_NAME_BUTTON")); + assertTrue("Page should contain \"Must be the same as name!\"", browser.isTextPresent("Must be the same as name!")); + + browser.type(getProperty("MINIMUM_AGE_INPUT"), age1); + browser.type(getProperty("MAXIMUM_AGE_INPUT"), age2); + browser.clickAndWait(getProperty("CHECK_AGES_BUTTON")); + assertTrue("Page should contain \"OK!\"", browser.isTextPresent("OK!")); + browser.type(getProperty("MINIMUM_AGE_INPUT"), age1); + browser.type(getProperty("MAXIMUM_AGE_INPUT"), age1); + browser.clickAndWait(getProperty("CHECK_AGES_BUTTON")); + assertTrue("Page should contain \"Must be larger than minimum!\"", browser.isTextPresent("Must be larger than minimum!")); + browser.type(getProperty("MINIMUM_AGE_INPUT"), age2); + browser.type(getProperty("MAXIMUM_AGE_INPUT"), age1); + browser.clickAndWait(getProperty("CHECK_AGES_BUTTON")); + assertTrue("Page should contain \"Must be larger than minimum!\"", browser.isTextPresent("Must be larger than minimum!")); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void validateEquality2Test(){ + String date1 = "2009-08-21"; + String date2 = "2009-08-25"; + browser.clickAndWait(VALIDATE_EQUALITY2_LINK); + + browser.type(getProperty("DATE_INPUT"), date1); + browser.type(getProperty("DATE_VERIFICATION_INPUT"), date1); + browser.clickAndWait(getProperty("CHECK_DATE_BUTTON")); + assertTrue("Page should contain \"OK!\"", browser.isTextPresent("OK!")); + + browser.type(getProperty("DATE_INPUT"), date1); + browser.type(getProperty("DATE_VERIFICATION_INPUT"), date2); + browser.clickAndWait(getProperty("CHECK_DATE_BUTTON")); + assertTrue("Page should contain \"Value does not equal that in 'date'\"", browser.isTextPresent("Value does not equal")); + //assertTrue("Page should contain information about Pete Muir working all the time on Seam", browser.isTextPresent("works on Seam, of course")); + } + + @Test(dependsOnMethods={"homePageLoadTest"}) + public void resourceDownloadTest(){ + String textToFind1 = "abc"; + String textToFind2 = "123"; + browser.clickAndWait(RESOURCE_DOWNLOAD_LINK); + + assertTrue( "File download failed: Restful with s:download \"Text\"", isDownloadWorking("/seam-ui/resources.seam?id=1", textToFind1)); + assertTrue( "File download failed: Restful with s:download \"Numbers\"", isDownloadWorking("/seam-ui/resources.seam?id=2", textToFind2)); + } + + private boolean isDownloadWorking(String pathToFile, String textToFind) + { + try + { + URL downloadUrl = new URL("http://localhost:8080" + pathToFile); + BufferedReader r = new BufferedReader(new InputStreamReader(downloadUrl.openStream())); + String str; + StringBuffer sb = new StringBuffer(); + while ((str = r.readLine()) != null) + { + sb.append(str); + } + return sb.toString().contains(textToFind); + } + catch (IOException e) + { + return false; + } + } +} Added: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/seam.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/seam.properties 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,3 @@ +#debug is explicitly disabled in test to avoid JBIDE-3623 +#Thu Dec 31 16:24:37 CET 2009 +org.jboss.seam.core.init.debug=false Added: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/ui.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/ui.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources/ui.properties 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,36 @@ +SELECT_ITEMS_TITLE=xpath\=//select[option[contains(@value,'MR')]] +SELECT_ITEMS_NAME=xpath\=//input[contains(@value,'Peter Muir')] +SELECT_ITEMS_CONTINENT=xpath\=//select[option[contains(text(),'Europe')]] +SELECT_ITEMS_USER=xpath\=//input[@type\='checkbox'][@value\='USER'] +SELECT_ITEMS_ADMIN=xpath\=//input[@type\='checkbox'][@value\='ADMIN'] +SELECT_ITEMS_MANAGER=xpath\=//input[@type\='checkbox'][@value\='MANAGER'] +SELECT_ITEMS_SUPERADMIN=xpath\=//input[@type\='checkbox'][@value\='SUPERADMIN'] +SELECT_ITEMS_AGE=xpath\=//select[option[contains(text(),'24')]] +SELECT_ITEMS_PET=xpath\=//select[option[contains(@value,'Dog')]] +SELECT_ITEMS_COLOURS=xpath\=//select[option[contains(text(),'Green')]] +SELECT_ITEMS_BOOK=xpath\=//select[option[contains(text(),'Pride and Prejudice by Jane Austin (British)')]] +SELECT_ITEMS_FILM=xpath\=//select[option[contains(text(),'Blade Runner directed by Ridley Scott')]] +SELECT_ITEMS_APPLY=xpath\=//input[@type\='submit'][@value\='Apply'] +SELECT_ITEMS_COUNTRY=xpath\=//input[@type\='radio'][@value\='18'] +JUMP_LINK=xpath\=//a[contains(text(),'Jump')] +JUMP_BUTTON=xpath\=//input[@type\='button'][@value\='Jump'] +LINK_LINK=xpath\=//a[contains(text(),'Link')] +DO_ACTION_LINK=xpath\=//a[contains(text(),'Do action')] +DO_ACTION_BUTTON=xpath\=//input[@type\='button'][@value\='Do action'] +#DISABLED_DO_ACTION_LINK=xpath\=//a[contains(text(),'Do action')][not(@href)] +#DISABLED_DO_ACTION_BUTTON=xpath\=//input[@type\='button'][@value\='Do action'][@disabled\='disabled'] +DISABLED_DO_ACTION_LINK=xpath\=//tr[contains(td[1]/text(), 'Disabled')]/td[2]/a[contains(text(),'Do action')][string-length(@href)=0] +DISABLED_DO_ACTION_BUTTON=xpath\=//tr[contains(td[1]/text(), 'Disabled')]/td[3]/input[@value\='Do action'][@type\='button'] +BEGIN_CONVERSATION_LINK=xpath\=//a[contains(text(),'Begin conversation')] +END_CONVERSATION_BUTTON=xpath\=//input[@type\='button'][@value\='End conversation'] +ADD_PARAMETER_LINK=xpath\=//a[contains(text(),'Add a page parameter')] +ADD_PARAMETER_BUTTON=xpath\=//input[@type\='button'][@value\='Add a page parameter'] +NAME_INPUT=xpath\=//input[@type\='text'][contains(@name,'name')][not(contains(@name,'nameVerification'))] +NAME_VERIFICATION_INPUT=xpath\=//input[@type\='text'][contains(@name,'nameVerification')] +CHECK_NAME_BUTTON=xpath\=//input[@type\='submit'][@value\='Check name'] +MINIMUM_AGE_INPUT=xpath\=//input[@type\='text'][contains(@name,'min')][not(contains(@name,'minVerification'))] +MAXIMUM_AGE_INPUT=xpath\=//input[@type\='text'][contains(@name,'minVerification')] +CHECK_AGES_BUTTON=xpath\=//input[@type\='submit'][@value\='Check ages'] +DATE_INPUT=xpath\=//input[contains(@name,'date')][not(contains(@name,'dateVerification'))] +DATE_VERIFICATION_INPUT=xpath\=//input[contains(@name,'dateVerification')] +CHECK_DATE_BUTTON=xpath\=//input[@type\='submit'][@value\='Check date'] Added: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/photo.jpg =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/photo.jpg (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/photo.jpg 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,5 @@ +�� +�� + \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/testng.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,26 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="UI example" verbose="2" parallel="false"> + <test name="ui_jboss5"> + <parameter name="PROPERTY_FILE" value="/ui.properties" /> + <classes> + <class name="org.jboss.seam.example.ui.test.selenium.SeleniumUITest" /> + <class name="org.jboss.seam.example.ui.test.htmlunit.HtmlUnitUITest" /> + </classes> + </test> +</suite> Property changes on: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/src/test/resources-ftest/testng.xml ___________________________________________________________________ Added: svn:executable + * Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,132 @@ +<?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>ui</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <artifactId>ui-web</artifactId> + <packaging>war</packaging> + <name>UI Web Module (EE6)</name> + + <properties> +  + <jndiPattern>java:app/ui-ejb/#{ejbName}</jndiPattern> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-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> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-core</artifactId> + </exclusion> + </exclusions> + </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> + </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> + <properties> +  + <jndiPattern>#{ejbName}/local</jndiPattern> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>ui-ejb</artifactId> + <type>ejb</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <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> + </dependencies> + <build> + <finalName>jboss-seam-ui</finalName> + </build> + </profile> + </profiles> +</project> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/resources/messages_en.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/resources/messages_en.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/resources/messages_en.properties 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1 @@ +javax.faces.component.UIInput.REQUIRED=value is required Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/components.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:cache="http://jboss.com/products/seam/cache" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:persistence="http://jboss.com/products/seam/persistence" + 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/components http://jboss.com/products/seam/components-2.3.xsd + http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.3.xsd + http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd"> + + <core:init jndi-pattern="@jndiPattern@" debug="true"/> + + <core:manager conversation-timeout="120000"/> + + <cache:eh-cache-provider/> + + <persistence:managed-persistence-context name="entityManager" persistence-unit-jndi-name="java:/uiEntityManagerFactory"/> + + <framework:entity-query name="countries" ejbql="select c from Country c" /> + + <framework:entity-query name="continents" ejbql="select c from Continent c" /> + + <framework:entity-home name="personHome" entity-class="org.jboss.seam.example.ui.Person" /> + + <framework:entity-query name="colours" ejbql="select c from Colour c" /> + + <framework:entity-query name="books" ejbql="select b from Book b" /> + + <framework:entity-query name="films" ejbql="select f from Film f" /> + + <factory name="person" value="#{personHome.instance}" /> + +</components> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/faces-config.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="2.1" + 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_1.xsd"> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/pages.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,44 @@ +<?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="/index.xhtml"> + <param name="personId" converterId="javax.faces.Integer" value="#{personHome.id}" /> + <begin-conversation join="true"/> + </page> + + <page view-id="/selectItems.xhtml"> + <begin-conversation join="true"/> + <param name="personId" converterId="javax.faces.Integer" value="#{personHome.id}" /> + <navigation from-action="#{personHome.update}"> + <rule if-outcome="updated"> + <render/> + </rule> + </navigation> + </page> + + <page view-id="/formattedText.xhtml"> + <param name="personId" converterId="javax.faces.Integer" value="#{personHome.id}" /> + </page> + + <page view-id="/fileUpload.xhtml"> + <begin-conversation join="true"/> + <param name="personId" converterId="javax.faces.Integer" value="#{personHome.id}" /> + <navigation from-action="#{personHome.update}"> + <rule if-outcome="updated"> + <render/> + </rule> + </navigation> + </page> + + <page view-id="/graphicImage.xhtml"> + <begin-conversation join="true"/> + <param name="personId" converterId="javax.faces.Integer" value="#{personHome.id}" /> + </page> + + <page view-id="/linkAndButton.xhtml"> + <param name="foo" value="#{buttonLink.foo}" /> + </page> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/WEB-INF/web.xml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app 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" + version="3.0"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + + <servlet> + <servlet-name>Document Store Servlet</servlet-name> + <servlet-class>org.jboss.seam.document.DocumentStoreServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Document Store Servlet</servlet-name> + <url-pattern>/seam/docstore/*</url-pattern> + </servlet-mapping> + + <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> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + + + <context-param> + <param-name>facelets.SKIP_COMMENTS</param-name> + <param-value>true</param-value> + </context-param> + + +  + <context-param> + <param-name>com.sun.faces.allowTextChildren</param-name> + <param-value>true</param-value> + </context-param> + +  + + <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/ui/ui-web/src/main/webapp/cache.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/cache.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/cache.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:cache" /> + <ui:define name="body"> + <p>Cache the rendered page fragment using cache. Note that s:cache actually uses the instance of EHCache managed by the built-in pojoCache component.</p> + <s:cache key="example">Some cached text</s:cache> + </ui:define> +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/continents.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,42 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:selectItems" /> + <ui:define name="body"> + <p> + Here you can select which continent a country is in. This + demonstrates using <code>s:selectItems</code> in a <code>h:dataTable</code>. + </p> + + + <h:form> + + <h:dataTable value="#{countries.dataModel}" var="country"> + <h:column> + <f:facet name="header"> + Country + </f:facet> + <h:outputText value="#{country.name}" /> + </h:column> + <h:column> + <f:facet name="header"> + Continent + </f:facet> + <h:selectOneMenu value="#{country.continent}"> + <s:selectItems value="#{continents.resultList}" var="continent" label="#{continent.name}" /> + <s:convertEntity /> + </h:selectOneMenu> + </h:column> + </h:dataTable> + <h:commandButton value="Apply"> + <s:conversationPropagation type="join" /> + </h:commandButton> + + </h:form> +</ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/date.css =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/date.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/date.css 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,185 @@ +div.seam-date +{ + margin-top: 5px; + border: 1px solid #AAAAAA; + background: #fff url(../img/input.bg.gif) 0 0 repeat-x; + background-color: #FFFFFF; + color: #505050; + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-size: 12px; +} + +table.seam-date td { + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-size: 11px; +} + +.seam-date-monthNames +{ + width: 70px; + border: 1px solid #dddddd; + border-right: 3px solid #444444; + border-bottom: 3px solid #444444; + background-color: #ffffff; + font-size: 12px; + cursor: pointer; + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-weight: normal; +} + +a.seam-date-monthNameLink, a.seam-date-monthNameLink:visited +{ + text-align: center; + display: block; + color: #555555; +} + +a.seam-date-monthNameLink:hover +{ + background-color: #CCCCCC; + color: red; +} + +.seam-date-years +{ + height: 10em; + overflow: auto; + width: 60px; + border: 1px solid #dddddd; + border-right: 3px solid #444444; + border-bottom: 3px solid #444444; + background-color: #ffffff; + font-size: 12px; + cursor: pointer; + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-weight: normal; +} + +a.seam-date-yearLink, a.seam-date-yearLink:visited +{ + text-align: center; + display: block; + color: #555555; +} + +a.seam-date-yearLink:hover +{ + background-color: #CCCCCC; + color: red; +} + +tr.seam-date-header +{ + padding: 2px 0px 2px 0px; +} + +td.seam-date-header +{ + padding: 0px 8px 0px 8px; + text-align: center; + color: gray; + font-family: Tahoma, Arial, Helvetica, sans-serif; + font-weight: bold; + font-size: 12px; +} + +td.seam-date-header-prevMonth +{ + background-image: url("../img/cal-prev.png"); + background-repeat: no-repeat; + background-position: center; + padding: 0px 2px 0px 2px; + width: 17px; + height: 16px; + margin-left: 2px; +} + +td.seam-date-header-nextMonth +{ + background-image: url("../img/cal-next.png"); + background-repeat: no-repeat; + background-position: center; + padding: 0px 2px 0px 2px; + width: 17px; + height: 16px; + margin-right: 2px; +} + +tr.seam-date-headerDays +{ + color: white; + font-weight: normal; +} + +tr.seam-date-headerDays > td +{ + background-color: #CCCCCC; + border: 1px solid #AAAAAA; + color: white; + text-align: center; + width: 26px; +} + +tr.seam-date-footer +{ + background-color: white; + color: #505050; + font-weight: bold; +} + +tr.seam-date-footer > td +{ + text-align: center; +} + +td.seam-date-inMonth +{ + background-color: white; + color: black; + font-weight: normal; + cursor: pointer; + border: 1px solid #ece9d8; +} + +td.seam-date-outMonth +{ + background-color: white; + color: #999999; + font-weight: normal; + cursor: pointer; + border: 1px solid #ece9d8; +} + +td.seam-date-selected +{ + background-color: #CCCCCC; + border: 1px solid #AAAAAA; + color: black; + font-weight: normal; +} + +td.seam-date-dayOff-inMonth +{ + background-color: #efefef; + color: black; + font-weight: normal; + cursor: pointer; + border: 1px solid #ece9d8; +} + +td.seam-date-dayOff-outMonth +{ + background-color: #efefef; + color: #999999; + font-weight: normal; + cursor: pointer; + border: 1px solid #ece9d8; +} + +td.seam-date-hover +{ + background-color: #CCCCCC; + border: 1px solid #AAAAAA; + cursor: pointer; + color: red; +} \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/decorateField.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/decorateField.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/decorateField.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,24 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib"> + + <div class="entry"> + <s:label styleClass="label #{invalid?'errors':''}"> + <ui:insert name="label"/> + <s:span styleClass="required" rendered="#{required}">*</s:span> + </s:label> + <span class="input #{invalid?'errors':''}"> + <s:validateAll> + <ui:insert/> + </s:validateAll> + </span> + <div> + <s:message styleClass="error errors"/> + </div> + <div class="description"><ui:insert name="description" /></div> + </div> + +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/dtpick.gif =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/dtpick.gif (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/dtpick.gif 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,2 @@ +GIF89a \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidator.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidator.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidator.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,37 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" xmlns:s="http://jboss.com/products/seam/taglib" template="template.xhtml"> + <ui:param name="tagName" value="s:validateEquality" /> + <ui:define name="body"> + <h:form> + <p>Validates that two java.lang.String inputs are equal (may be empty)</p> + <h:panelGrid columns="3"> + <s:label for="name">Name</s:label> + <h:inputText id="name" value="#{equalityValidatorBean.name}" /> + <h:message for="name" /> + <s:label for="nameVerification">Name Verification</s:label> + <h:inputText id="nameVerification"> + <s:validateEquality for="name" message="Must be the same as name!" required="false" /> + </h:inputText> + <h:message for="nameVerification" /> + <h:commandButton action="#{equalityValidatorBean.check}" value="Check name" /> + </h:panelGrid> + </h:form> + + <h:form> + <p>Validates that one number is greater than another</p> + <h:panelGrid columns="3"> + <s:label for="min">Minimum age (e.g. 18)</s:label> + <h:inputText id="min" value="#{equalityValidatorBean.age}" /> + <h:message for="min" /> + <s:label for="minVerification">Maximum age (e.g. 25)</s:label> + <h:inputText id="minVerification"> + <f:convertNumber integerOnly="true" /> + <s:validateEquality for="min" message="Must be larger than minimum!" operator="greater" /> + </h:inputText> + <h:message for="minVerification" /> + <h:commandButton action="#{equalityValidatorBean.check}" value="Check ages" /> + </h:panelGrid> + </h:form> + </ui:define> +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidatorWConvert.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidatorWConvert.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/equalityValidatorWConvert.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,31 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + <ui:param name="tagName" value="s:validateEquality" /> + <ui:define name="body"> + <p>Validates that two java.util.Date inputs are equal</p> + <h:form> + <h:panelGrid columns="3"> + <s:label for="date">Date (yyyy-MM-dd)</s:label> + <h:inputText id="date" value="#{equalityValidatorBean.date}"> + <f:convertDateTime pattern="yyyy-MM-dd" /> + </h:inputText> + <h:message for="date" /> + <s:label for="dateVerification">Date Verification (yyyy-MM-dd)</s:label> + <h:inputText id="dateVerification"> + <f:convertDateTime pattern="yyyy-MM-dd" /> + <s:validateEquality for="date" /> + </h:inputText> + <h:message for="dateVerification" /> + <h:commandButton action="#{equalityValidatorBean.checkDate}" + value="Check date" /> + </h:panelGrid> + </h:form> + + + </ui:define> +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fileUpload.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fileUpload.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fileUpload.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,21 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:fileUpload" /> + <ui:define name="body"> + <p>Renders a file upload control.</p> + <h:form enctype="multipart/form-data"> + <h:panelGrid columns="2"> + <h:outputText value="#{person.name}'s Picture" /> + <s:fileUpload data="#{person.picture.data}" contentType="#{person.picture.contentType}" fileName="#{person.picture.fileName}" accept="images/png,images/jpg" /> + <h:commandButton action="#{personHome.update}" value="Update" /> + <h:outputText/> + </h:panelGrid> + </h:form> + </ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/formattedText.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/formattedText.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/formattedText.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,14 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:formattedText" /> + <ui:define name="body"> + <p>Output Seam Text:</p> + <p>In his/her spare time, <h:outputText value="#{person.name}"/> <s:formattedText value="#{person.hobbies}" /></p> + </ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fragment.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fragment.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/fragment.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,14 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:fragment" /> + <ui:define name="body"> + <p>A non-rendering component useful for enabling/disabling rendering of it's children.</p> + <p><s:fragment rendered="true">This fragment is rendered</s:fragment> whilst <s:fragment rendered="false">this one isn't</s:fragment></p> + </ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/graphicImage.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/graphicImage.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/graphicImage.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,22 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:graphicImage" /> + <ui:define name="body"> + <p>Outputs an image</p> + <h:panelGrid> + <s:fragment> + <s:graphicImage value="#{person.picture.data}"> + <s:transformImageSize factor="0.5" /> + </s:graphicImage> + <h:outputText value="No image found (upload one)" rendered="#{person.picture.contentType eq null}" /> + </s:fragment> + <h:outputText value="Picture of #{person.name}" /> + </h:panelGrid> + </ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.html 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=index.seam"> +</head> +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/index.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,14 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:aca="http://www.aca-it.be/taglib/jsf" + template="template.xhtml" + > + <ui:param name="tagName" value="" /> + <ui:define name="body"> + <p>Seam ui components</p> + </ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/linkAndButton.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/linkAndButton.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/linkAndButton.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,47 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:link/s:button" /> + <ui:define name="body"> + <p>A link/button that supports invocation of an action with control over conversation propagation. <i>Does not submit the form.</i></p> + <p>Some of the things you can do with a s:link or s:button:</p> + <h:panelGrid columns="3"> + <h:outputText value="Jump to a fragment on a view" /> + <s:link view="/linkAndButton.xhtml" fragment="fragment" value="Jump" /> + <s:button view="/linkAndButton.xhtml" fragment="fragment" value="Jump" /> + + <h:outputText value="Link on children" /> + <s:link view="/linkAndButton.xhtml">Link</s:link> + <h:outputText value="N/A" /> + + <h:outputText value="Do an action" /> + <s:link action="#{buttonLink.simpleAction}" value="Do action" /> + <s:button action="#{buttonLink.simpleAction}" value="Do action" /> + + <h:outputText value="Disabled" /> + <s:link action="#{buttonLink.simpleAction}" value="Do action" disabled="true"/> + <s:button action="#{buttonLink.simpleAction}" value="Do action" disabled="true"/> + + <h:outputText value="Conversation Propagation" /> + <s:link view="/linkAndButton.xhtml" value="Begin conversation" propagation="begin" /> + <s:button view="/linkAndButton.xhtml" value="End conversation"> + <s:conversationPropagation type="end" /> + </s:button> + + <h:outputText value="Page parameters" /> + <s:link action="#{buttonLink.simpleAction}" value="Add a page parameter"> + <f:param name="foo" value="bar" /> + </s:link> + <s:button action="#{buttonLink.simpleAction}" value="Add a page parameter"> + <f:param name="foo" value="bar" /> + </s:button> + </h:panelGrid> + <p>You can also start a pageflow or start/resume a task - this isn't demonstrated here.</p> + <p><a name="fragment">A fragment to jump to</a></p> + </ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resource.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resource.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resource.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,26 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + <ui:param name="tagName" value="s:resource, s:download" /> + <ui:define name="body"> + <p>Download a file.</p> + <h:panelGrid columns="3"> + <h:outputText value="Totally restful" /> + <h:outputLink value="resources.seam?id=1">Text</h:outputLink> + <h:outputLink value="resources.seam?id=2">Numbers</h:outputLink> + <h:outputText value="Restful with s:download" /> + <s:download src="/resources.xhtml"> + <h:outputText value="Text" /> + <f:param name="id" value="1" /> + </s:download> + <s:download src="/resources.xhtml"> + <h:outputText value="Numbers" /> + <f:param name="id" value="2" /> + </s:download> + </h:panelGrid> + </ui:define> +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resources.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resources.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/resources.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,5 @@ +<s:resource xmlns="http://www.w3.org/1999/xhtml" + xmlns:s="http://jboss.com/products/seam/taglib" + data="#{resources.item.data}" + contentType="#{resources.item.contentType}" + fileName="#{resources.item.fileName}" /> Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/selectItems.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,113 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml" + > + <ui:param name="tagName" value="s:selectItems" /> + <ui:define name="body"> + <p>This example shows example usage of the <code>s:selectItems</code> tag being used for CRUD on a <code>Person</code> entity.</p> + <p>The example also uses:</p> + <ul> + <li><code>s:span</code></li> + <li><code>s:convertEnum</code></li> + <li><code>s:message</code></li> + <li><code>s:decorate</code></li> + <li><code>s:link</code></li> + <li><code>s:conversationPropagation</code></li> + <li><code>s:decorate</code></li> + </ul> + + <p><s:link view="/continents.xhtml" value="Edit the continent/country relationship." /></p> + + <h:form> + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Title</ui:define> + <h:selectOneMenu value="#{person.honorific}"> + <s:selectItems value="#{honorifics}" var="honorific" label="#{honorific.label}" noSelectionLabel="Please select" /> + <s:convertEnum /> + </h:selectOneMenu> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Name</ui:define> + <ui:define name="description">Enter your name as it appears on your passport</ui:define> + <h:inputText value="#{person.name}" required="true" /> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Continent of Birth</ui:define> + <h:selectOneMenu value="#{personHome.instance.continent}" required="true" id="continent"> + <s:selectItems value="#{continents.resultList}" var="continent" label="#{continent.name}" noSelectionLabel="Please Select..."/> + <s:convertEntity /> + </h:selectOneMenu> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Country of Birth</ui:define> + <h:selectOneRadio value="#{personHome.instance.country}" required="true" disabled="#{empty person.continent}"> + <s:selectItems value="#{personHome.instance.continent.countries}" var="country" label="#{country.name} (#{country.continent.name})" noSelectionLabel="Please Select..." hideNoSelectionLabel="true"/> + <s:convertEntity /> + </h:selectOneRadio> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Roles</ui:define> + <h:selectManyCheckbox value="#{person.roles}" required="true" collectionType="java.util.ArrayList"> + <s:selectItems value="#{roles}" var="role" label="#{role.name}"/> + <s:convertEnum /> + </h:selectManyCheckbox> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Age</ui:define> + <ui:define name="description">The age list is an array of primitives</ui:define> + <h:selectOneMenu value="#{person.age}"> + <s:selectItems value="#{ages}" var="age" label="#{age}" /> + <f:converter converterId="ageConverter" /> + </h:selectOneMenu> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Pet</ui:define> + <ui:define name="description">The animal list is a list of Strings</ui:define> + <h:selectOneMenu value="#{person.pet}"> + <s:selectItems value="#{animals}" var="animal" label="#{animal.name} (#{animal.notes})" itemValue="#{animal.name}" noSelectionLabel="Select your pet"/> + </h:selectOneMenu> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Favourite Colours</ui:define> + <ui:define name="description">A colour is an entity</ui:define> + <h:selectManyListbox value="#{personHome.instance.favouriteColours}" collectionType="java.util.ArrayList"> + <s:selectItems value="#{colours.resultList}" var="colour" label="#{colour.name}" /> + <s:convertEntity /> + </h:selectManyListbox> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Favourite Book</ui:define> + <ui:define name="description">A book has a composite key</ui:define> + <h:selectOneListbox value="#{person.favouriteBook}" > + <s:selectItems value="#{books.resultList}" var="book" label="#{book.name} by #{book.author} (#{book.nationality})" /> + <s:convertEntity /> + </h:selectOneListbox> + </s:decorate> + + <s:decorate template="decorateField.xhtml"> + <ui:define name="label">Favourite Film</ui:define> + <ui:define name="description">Film uses <code>@Converter(forClass="...")</code> - there is no converter specified in the facelet</ui:define> + <h:selectOneListbox value="#{person.favouriteFilm}"> + <s:selectItems value="#{films.resultList}" var="film" label="#{film.name} directed by #{film.director}" noSelectionLabel="Please Select..."/> + </h:selectOneListbox> + </s:decorate> + + <h:commandButton value="Apply" action="#{personHome.update}"> + <s:conversationPropagation type="join" /> + </h:commandButton> + + </h:form> +</ui:define> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/src/main/webapp/template.xhtml 2012-03-14 17:50:07 UTC (rev 14402) @@ -0,0 +1,128 @@ +<!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" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> +<title>UI Example: #{tagName}</title> +<link href="date.css" rel="stylesheet" type="text/css" /> +<style type="text/css"> +.label { + font-weight: bold; + color: #5E5147; +} +.errors { + font-size: small; + font-weight: bold; + text-align: center; + color: #600; +} +.errors div { + text-align: left; +} +.errors span { + text-align: left; +} +.errors input { + border: 1px solid #600; +} +.errors ul { + list-style: none; +} +.entry { + padding-top: 10px; +} +.entry .label { + float: left; + padding-right: 5px; + font-weight: bold; + width: 250px; + text-align: right; +} + +.entry .input { + width: 600px; + text-align: left; +} +.entry .error { + width: 600px; + text-align: left; + margin-left: 270px; +} + +.entry .description { + font-size: x-small; + margin-left: 270px; +} + +.menu { + width: 220px; + float: left; + padding: 10px; +} + +.content { + margin-left: 200px; +} +</style> +<ui:debug id="debug" /> +</head> + +<body> +<s:div styleClass="menu"> + <ul> + <li><s:link view="/selectItems.xhtml" propagation="join"> + <code>s:selectItems</code> + <f:param name="personId" value="1" /> + </s:link></li> + <li><s:link view="/fragment.xhtml" propagation="none"> + <code>s:fragment</code> + </s:link></li> + <li><s:link view="/formattedText.xhtml" propagation="join"> + <code>s:formattedText</code> + <f:param name="personId" value="1" /> + </s:link></li> + <li><s:link view="/fileUpload.xhtml" propagation="join"> + <code>s:fileUpload</code> + <f:param name="personId" value="1" /> + </s:link></li> + <li><s:link view="/linkAndButton.xhtml" propagation="none"> + <code>s:button</code> and <code>s:link</code> + </s:link></li> + <li><s:link view="/cache.xhtml" propagation="none"> + <code>s:cache</code> + </s:link></li> + <li><s:link view="/graphicImage.xhtml"> + <code>s:graphicImage</code> + <f:param name="personId" value="1" /> + </s:link></li> + + <li><s:link view="/equalityValidator.xhtml"> + <code>s:validateEquality</code> + </s:link></li> + + <li><s:link view="/equalityValidatorWConvert.xhtml"> + <code>s:validateEquality(2)</code> + </s:link></li> + + <li><s:link view="/resource.xhtml"> + <code>s:resource/download</code> + </s:link></li> + + + <li><s:span title="#{spanTitle}" style="font-weight:bold"> + <code>s:span</code> + </s:span> + </li> + + </ul> +</s:div> +<s:div styleClass="content"> + <h1><code><h:outputText value="#{tagName}" /></code></h1> + <ui:insert name="body" /> + <h:messages /> +</s:div> +</body> + +</html> \ No newline at end of file

12 years, 1 month

1
0
0 / 0

Seam SVN: r14401 - in branches/community/Seam_2_3: jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2 and 2 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:48:19 -0400 (Wed, 14 Mar 2012) New Revision: 14401 Added: branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/resources/ branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/resources/debug.xhtml Removed: branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/debug.xhtml Modified: branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Init.java Log: JBSEAM-4864 move META-INF/debug.xhtml to META-INF/resources/debug.xhtml Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Init.java =================================================================== --- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Init.java 2012-03-14 17:47:03 UTC (rev 14400) +++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/core/Init.java 2012-03-14 17:48:19 UTC (rev 14401) @@ -442,7 +442,7 @@ */ public boolean isDebugPageAvailable() { - return debug && Resources.getResource("META-INF/debug.xhtml", null) != null; + return debug && Resources.getResource("META-INF/resources/debug.xhtml", null) != null; } public boolean isMyFacesLifecycleBug() Modified: branches/community/Seam_2_3/jboss-seam-debug/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 2012-03-14 17:47:03 UTC (rev 14400) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/java/org/jboss/seam/debug/jsf2/SeamDebugPhaseListener.java 2012-03-14 17:48:19 UTC (rev 14401) @@ -42,7 +42,7 @@ try { FacesContext facesContext = FacesContext.getCurrentInstance(); - URL url = SeamDebugPhaseListener.class.getClassLoader().getResource("META-INF/debug.xhtml"); + URL url = SeamDebugPhaseListener.class.getClassLoader().getResource("META-INF/resources/debug.xhtml"); ResourceResolver resroler=new ResourceResolver(){ @Override Deleted: branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/debug.xhtml =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/debug.xhtml 2012-03-14 17:47:03 UTC (rev 14400) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/debug.xhtml 2012-03-14 17:48:19 UTC (rev 14401) @@ -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> Copied: branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/resources/debug.xhtml (from rev 14400, branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/debug.xhtml) =================================================================== --- branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/resources/debug.xhtml (rev 0) +++ branches/community/Seam_2_3/jboss-seam-debug/src/main/resources/META-INF/resources/debug.xhtml 2012-03-14 17:48:19 UTC (rev 14401) @@ -0,0 +1,255 @@ +<!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>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14399 - in branches/community/Seam_2_3: jboss-seam-parent and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:44:21 -0400 (Wed, 14 Mar 2012) New Revision: 14399 Modified: branches/community/Seam_2_3/examples-ee6/booking/pom.xml branches/community/Seam_2_3/jboss-seam-parent/pom.xml Log: removed some dependency Management from booking parent and let it to define that on examples-ee6 depmgmt 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:44:12 UTC (rev 14398) +++ branches/community/Seam_2_3/examples-ee6/booking/pom.xml 2012-03-14 17:44:21 UTC (rev 14399) @@ -43,26 +43,6 @@ <version>${project.version}</version> <type>ear</type> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.2.0.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>4.0.1.Final</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.6.1</version> - </dependency> </dependencies> </dependencyManagement> </project> 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:44:12 UTC (rev 14398) +++ branches/community/Seam_2_3/jboss-seam-parent/pom.xml 2012-03-14 17:44:21 UTC (rev 14399) @@ -52,6 +52,7 @@ <version.jsf2>2.1.5</version.jsf2> <version.junit>4.8.2</version.junit> <version.hibernatevalidator>4.2.0.Final</version.hibernatevalidator> + <version.hibernatesearch>4.0.0.Final</version.hibernatesearch> <version.hcore>4.0.1.Final</version.hcore>  @@ -395,7 +396,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-search</artifactId> - <version>3.1.1.GA</version> + <version>${version.hibernatesearch}</version> </dependency> <dependency>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14398 - in branches/community/Seam_2_3/examples-ee6/todo: todo-tests and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:44:12 -0400 (Wed, 14 Mar 2012) New Revision: 14398 Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml Log: JBSEAM-4900 finished todo example for verification of jbpm upgrade Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml 2012-03-14 17:44:04 UTC (rev 14397) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml 2012-03-14 17:44:12 UTC (rev 14398) @@ -78,6 +78,11 @@ <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <profiles> 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:44:04 UTC (rev 14397) +++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-03-14 17:44:12 UTC (rev 14398) @@ -14,6 +14,11 @@ <dependencies> <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> <groupId>org.jboss.seam.examples-ee6.todo</groupId> <artifactId>todo-ejb</artifactId> <type>ejb</type> @@ -25,11 +30,6 @@ <type>ejb</type> <scope>test</scope> </dependency> - - - - - <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-api</artifactId> @@ -47,14 +47,12 @@ <groupId>org.jboss.seam</groupId> <artifactId>functional-tests</artifactId> <scope>test</scope> - </dependency> - + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> - </dependency> - + </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> <artifactId>arquillian-junit-container</artifactId> @@ -86,7 +84,15 @@ <filtering>true</filtering> </testResource> </testResources> - + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> </build> <profiles>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14397 - branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-03-14 13:44:04 -0400 (Wed, 14 Mar 2012) New Revision: 14397 Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java Log: fixed jbpm version for integration test deployment 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:43:53 UTC (rev 14396) +++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-03-14 17:44:04 UTC (rev 14397) @@ -73,7 +73,7 @@ .configureFrom("pom.xml") .goOffline() .artifact("org.jboss.seam:jboss-seam:2.3.0.Beta1-SNAPSHOT") - .artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3-seam2") + .artifact("org.jbpm.jbpm3:jbpm-jpdl:3.2.10.SP3_seam2") .exclusion("org.hibernate:hibernate-core") .resolveAsFiles()); }

12 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits March 2012