[richfaces-svn-commits] JBoss Rich Faces SVN: r2419 - in trunk/samples: seamEAR/ear and 12 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Wed Aug 22 18:21:07 EDT 2007
Author: alexsmirnov
Date: 2007-08-22 18:21:06 -0400 (Wed, 22 Aug 2007)
New Revision: 2419
Added:
trunk/samples/seamEAR/ear/META-INF/
trunk/samples/seamEAR/ear/META-INF/MANIFEST.MF
trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/Register.java
trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/RegisterAction.java
trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/User.java
trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/
trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PageDescriptionBean.java
trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PagesBean.java
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/register.xhtml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/registered.xhtml
Removed:
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp
trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java
Modified:
trunk/samples/pom.xml
trunk/samples/seamEAR/ear/pom.xml
trunk/samples/seamEAR/ejbs/pom.xml
trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/StatelessBean.java
trunk/samples/seamEAR/wars/seamWebapp/pom.xml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml
trunk/samples/seamIntegration/pom.xml
trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml
Log:
Seam examples runs under a Jboss portal, as far as in the standalone Jetty/Tomcat
Modified: trunk/samples/pom.xml
===================================================================
--- trunk/samples/pom.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/pom.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -1,422 +1,437 @@
-<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>root</artifactId>
- <groupId>org.richfaces</groupId>
- <version>3.1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces</groupId>
- <artifactId>samples</artifactId>
- <packaging>pom</packaging>
- <name>RichFaces Components Examples</name>
- <version>3.1.0-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossrichfaces/samples</url>
- <properties>
- <!-- -->
- </properties>
- <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <!--
- -->
- <version>6.1.3</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8080</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
-
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.12</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>0.9.5</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <profiles>
- <profile>
- <id>jsf1_1</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>jsfVersion</name>
- <value>1.1</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf1_2</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>jsfVersion</name>
- <value>1.2</value>
- </property>
- </activation>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>tomcat5</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>tomcat6</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jboss42</id>
- <build>
- <defaultGoal>jetty:run</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.2_04</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_04</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>myfaces</id>
- <properties>
- <myfaces>1.1.5</myfaces>
- <tomahawk>1.1.5</tomahawk>
- </properties>
- <build>
- <plugins />
- </build>
- <dependencies>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
- <modules>
- <module>skins</module>
- <module>separator-sample</module>
- <module>panel-sample</module>
- <module>gmap-sample</module>
- <module>togglePanel-sample</module>
- <module>tabPanelDemo</module>
- <module>simpleTogglePanel-sample</module>
- <module>inputNumberSpinnerDemo</module>
- <module>inputNumberSliderDemo</module>
- <module>panelbar-sample</module>
- <module>toolBarDemo</module>
- <module>tree-demo</module>
- <module>dataFilterSliderDemo</module>
- <module>suggestionbox-sample</module>
- <module>dragDropDemo</module>
- <module>dataTableDemo</module>
- <module>modalpanel-sample</module>
- <module>datascroller-sample</module>
- <module>effect-sample</module>
- <module>richfaces-demo</module>
- <module>dropdownmenu-sample</module>
- <module>tooltip-sample</module>
- <module>calendar-sample</module>
- <module>treeModelDemo</module>
- <module>local-value-demo</module>
- <!--
- <module>ajaxPortlet</module>
- -->
- <module>panelmenu-sample</module>
- <module>rich-message-demo</module>
- <module>scrollableDataTableDemo</module>
- </modules>
+<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>root</artifactId>
+ <groupId>org.richfaces</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces</groupId>
+ <artifactId>samples</artifactId>
+ <packaging>pom</packaging>
+ <name>RichFaces Components Examples</name>
+ <version>3.1.0-SNAPSHOT</version>
+ <url>http://labs.jboss.com/jbossrichfaces/samples</url>
+ <properties>
+ <!-- -->
+ </properties>
+ <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <!--
+ -->
+ <version>6.1.3</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <connectors>
+ <connector
+ implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.12</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>0.9.5</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>jsf1_1</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jsfVersion</name>
+ <value>1.1</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jsf1_2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>jsfVersion</name>
+ <value>1.2</value>
+ </property>
+ </activation>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>tomcat5</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>tomcat6</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jboss42</id>
+ <build>
+ <defaultGoal>jetty:run</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>myfaces</id>
+ <properties>
+ <myfaces>1.1.5</myfaces>
+ <tomahawk>1.1.5</tomahawk>
+ </properties>
+ <build>
+ <plugins />
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.framework</groupId>
+ <artifactId>richfaces-impl</artifactId>
+ <version>3.1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${myfaces}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>seam</id>
+ <activation>
+ <property>
+ <name>seamHome</name>
+ </property>
+ </activation>
+ <modules>
+ <module>seamEAR</module>
+ <module>seamIntegration</module>
+ </modules>
+ </profile>
+ </profiles>
+ <modules>
+ <module>skins</module>
+ <module>separator-sample</module>
+ <module>panel-sample</module>
+ <module>gmap-sample</module>
+ <module>togglePanel-sample</module>
+ <module>tabPanelDemo</module>
+ <module>simpleTogglePanel-sample</module>
+ <module>inputNumberSpinnerDemo</module>
+ <module>inputNumberSliderDemo</module>
+ <module>panelbar-sample</module>
+ <module>toolBarDemo</module>
+ <module>tree-demo</module>
+ <module>dataFilterSliderDemo</module>
+ <module>suggestionbox-sample</module>
+ <module>dragDropDemo</module>
+ <module>dataTableDemo</module>
+ <module>modalpanel-sample</module>
+ <module>datascroller-sample</module>
+ <module>effect-sample</module>
+ <module>richfaces-demo</module>
+ <module>dropdownmenu-sample</module>
+ <module>tooltip-sample</module>
+ <module>calendar-sample</module>
+ <module>treeModelDemo</module>
+ <module>local-value-demo</module>
+ <!--
+ <module>ajaxPortlet</module>
+ -->
+ <module>panelmenu-sample</module>
+ <module>rich-message-demo</module>
+ <module>scrollableDataTableDemo</module>
+ </modules>
</project>
\ No newline at end of file
Added: trunk/samples/seamEAR/ear/META-INF/MANIFEST.MF
===================================================================
--- trunk/samples/seamEAR/ear/META-INF/MANIFEST.MF (rev 0)
+++ trunk/samples/seamEAR/ear/META-INF/MANIFEST.MF 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/samples/seamEAR/ear/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/seamEAR/ear/pom.xml
===================================================================
--- trunk/samples/seamEAR/ear/pom.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/ear/pom.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -56,6 +56,7 @@
<version>2.0.0.BETA</version>
<systemPath>${seamHome}/jboss-seam.jar</systemPath>
<scope>system</scope>
+ <type>ejb</type>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -71,16 +72,18 @@
<plugin>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
- <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
<modules>
- <jarModule>
+ <ejbModule>
<groupId>jboss</groupId>
<artifactId>jboss-seam-core</artifactId>
- <includeInApplicationXml>
+ <!--
+ <includeInApplicationXml>
true
- </includeInApplicationXml>
+ </includeInApplicationXml>
+ -->
<bundleDir>/</bundleDir>
- </jarModule>
+ </ejbModule>
<ejbModule>
<groupId>
org.richfaces.samples.seamEAR
Modified: trunk/samples/seamEAR/ejbs/pom.xml
===================================================================
--- trunk/samples/seamEAR/ejbs/pom.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/ejbs/pom.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -47,6 +47,32 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_04</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.0.ga</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
<finalName>ejbs</finalName>
Added: trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/Register.java
===================================================================
--- trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/Register.java (rev 0)
+++ trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/Register.java 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,9 @@
+package org.richfaces.seam;
+
+import javax.ejb.Local;
+
+ at Local
+public interface Register
+{
+ public String register();
+}
\ No newline at end of file
Property changes on: trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/Register.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/RegisterAction.java
===================================================================
--- trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/RegisterAction.java (rev 0)
+++ trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/RegisterAction.java 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,55 @@
+/**
+ *
+ */
+package org.richfaces.seam;
+
+import java.util.List;
+
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.log.Log;
+
+/**
+ * @author asmirnov
+ *
+ */
+ at Stateless
+ at Name("register")
+public class RegisterAction implements Register
+{
+
+ @In
+ private User user;
+
+ @PersistenceContext
+ private EntityManager em;
+
+ @Logger
+ private Log log;
+
+ public String register()
+ {
+ List existing = em.createQuery(
+ "select username from User where username=#{user.username}")
+ .getResultList();
+
+ if (existing.size()==0)
+ {
+ em.persist(user);
+ log.info("Registered new user #{user.username}");
+ return "registered";
+ }
+ else
+ {
+ FacesMessages.instance().add("User #{user.username} already exists");
+ return null;
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/RegisterAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/StatelessBean.java
===================================================================
--- trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/StatelessBean.java 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/StatelessBean.java 2007-08-22 22:21:06 UTC (rev 2419)
@@ -11,8 +11,7 @@
* @author asmirnov
*
*/
- at Name("stateless")
- at Stateless
+
public class StatelessBean {
}
Added: trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/User.java
===================================================================
--- trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/User.java (rev 0)
+++ trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/User.java 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,79 @@
+/**
+ *
+ */
+package org.richfaces.seam;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.validator.Length;
+import org.hibernate.validator.NotNull;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * @author asmirnov
+ *
+ */
+ at Entity
+ at Name("user")
+ at Scope(ScopeType.SESSION)
+ at Table(name="users")
+public class User implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3165725145949171858L;
+
+ private String username;
+
+ private String password;
+
+ private String name;
+ public User(String name, String password, String username)
+ {
+ this.name = name;
+ this.password = password;
+ this.username = username;
+ }
+
+ public User() {};
+
+ @NotNull @Length(min=5, max=15)
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ @NotNull
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @Id @NotNull @Length(min=5, max=15)
+ public String getUsername()
+ {
+ return username;
+ }
+
+ public void setUsername(String username)
+ {
+ this.username = username;
+ }
+}
Property changes on: trunk/samples/seamEAR/ejbs/src/main/java/org/richfaces/seam/User.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/samples/seamEAR/wars/seamWebapp/pom.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -90,12 +90,13 @@
<version>3.3.0.ga</version>
<scope>provided</scope>
</dependency>
- <!--
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
+ <version>3.2.0.ga</version>
+ <scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PageDescriptionBean.java
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PageDescriptionBean.java (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PageDescriptionBean.java 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,44 @@
+/**
+ *
+ */
+package org.ajax4jsf;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class PageDescriptionBean {
+
+ private String _path;
+
+ private String _title;
+
+ /**
+ * @return the path
+ */
+ public String getPath() {
+ return _path;
+ }
+
+ /**
+ * @param path the path to set
+ */
+ public void setPath(String path) {
+ _path = path;
+ }
+
+ /**
+ * @return the title
+ */
+ public String getTitle() {
+ return _title;
+ }
+
+ /**
+ * @param title the title to set
+ */
+ public void setTitle(String title) {
+ _title = title;
+ }
+
+}
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PageDescriptionBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PagesBean.java
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PagesBean.java (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PagesBean.java 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,125 @@
+/**
+ *
+ */
+package org.ajax4jsf;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class PagesBean {
+
+ private static final Pattern JSP_PATTERN = Pattern.compile(".*\\.jspx?");
+
+ private static final Pattern XHTML_PATTERN = Pattern.compile(".*\\.xhtml");
+
+ private static final Pattern TITLE_PATTERN = Pattern.compile("<title>(.*)</title>",Pattern.CASE_INSENSITIVE|Pattern.MULTILINE);
+
+ private ServletContext _servletContext;
+
+ private List<PageDescriptionBean> _jspPages;
+
+ private String _path;
+
+ private List<PageDescriptionBean> _xhtmlPages;
+
+ /**
+ * @return the path
+ */
+ public String getPath() {
+ return _path;
+ }
+
+ /**
+ * @param path
+ * the path to set
+ */
+ public void setPath(String path) {
+ _path = path;
+ }
+
+ /**
+ * @return the servletContext
+ */
+ public ServletContext getServletContext() {
+ return _servletContext;
+ }
+
+ /**
+ * @param servletContext
+ * the servletContext to set
+ */
+ public void setServletContext(ServletContext servletContext) {
+ _servletContext = servletContext;
+ }
+
+ public List<PageDescriptionBean> getJspPages() {
+ if (_jspPages == null && null != getServletContext()) {
+ _jspPages = getPagesByPattern(JSP_PATTERN);
+ }
+
+ return _jspPages;
+ }
+
+ public List<PageDescriptionBean> getXhtmlPages() {
+ if (_xhtmlPages == null && null != getServletContext()) {
+ _xhtmlPages = getPagesByPattern(XHTML_PATTERN);
+ }
+
+ return _xhtmlPages;
+ }
+
+ /**
+ *
+ */
+ private List<PageDescriptionBean> getPagesByPattern(Pattern pattern) {
+ List<PageDescriptionBean> jspPages = new ArrayList<PageDescriptionBean>();
+ Set resourcePaths = getServletContext().getResourcePaths(getPath());
+ for (Iterator iterator = resourcePaths.iterator(); iterator
+ .hasNext();) {
+ String page = (String) iterator.next();
+ if (pattern.matcher(page).matches()) {
+ PageDescriptionBean pageBean = new PageDescriptionBean();
+ pageBean.setPath(page);
+ InputStream pageInputStream = getServletContext().getResourceAsStream(page);
+ if(null != pageInputStream){
+ byte[] head = new byte[1024];
+ try {
+ int readed = pageInputStream.read(head);
+ String headString = new String(head,0,readed);
+ Matcher titleMatcher = TITLE_PATTERN.matcher(headString);
+ if(titleMatcher.find() && titleMatcher.group(1).length()>0){
+ pageBean.setTitle(titleMatcher.group(1));
+ } else {
+ pageBean.setTitle(page);
+ }
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } finally {
+ try {
+ pageInputStream.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+ jspPages.add(pageBean);
+ }
+ }
+ return jspPages;
+ }
+
+}
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/java/org/ajax4jsf/PagesBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2007-08-22 22:21:06 UTC (rev 2419)
@@ -1,2 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<PROCESS ENTITY="JSFProcess"/>
+<PROCESS ENTITY="JSFProcess">
+ <PROCESS-ITEM ENTITY="JSFProcessGroup"
+ NAME="rules:#pages#register.xhtml" PATH="/pages/register.xhtml" SHAPE="104,115,0,0">
+ <PROCESS-ITEM ENTITY="JSFProcessItem"
+ ID="rules:#pages#register.xhtml:0" NAME="item" PATH="/pages/register.xhtml">
+ <PROCESS-ITEM-OUTPUT ENTITY="JSFProcessItemOutput"
+ ID="registered::#pages#registered.xhtml" NAME="output"
+ PATH="/pages/registered.xhtml"
+ TARGET="rules:#pages#registered.xhtml" TITLE="registered"/>
+ </PROCESS-ITEM>
+ </PROCESS-ITEM>
+ <PROCESS-ITEM ENTITY="JSFProcessGroup"
+ NAME="rules:#pages#registered.xhtml" PATH="/pages/registered.xhtml"
+ SHAPE="278,197,0,0" persistent="true"/>
+</PROCESS>
Modified: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/faces-config.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -1,18 +1,22 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<faces-config version="1.2"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <navigation-rule>
+ <from-view-id>/pages/register.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>registered</from-outcome>
+ <to-view-id>/pages/registered.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <application>
+ <message-bundle>messages</message-bundle>
+ <locale-config>
+ <default-locale>en</default-locale>
+ </locale-config>
+ <!-- Disabled when using Ajax4JSF
- <application>
- <message-bundle>messages</message-bundle>
- <locale-config>
- <default-locale>en</default-locale>
- </locale-config>
- <!-- Disabled when using Ajax4JSF -->
- <!--
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-->
- </application>
-
+ </application>
</faces-config>
Modified: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -1,81 +1,65 @@
-<?xml version="1.0" ?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <!-- Ajax4jsf -->
-
- <context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>com.sun.facelets.FaceletViewHandler</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.ajax4jsf.SKIN</param-name>
- <param-value>blueSky</param-value>
- </context-param>
-
- <!-- Seam -->
-
- <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>
-
- <!-- Facelets development mode (disable in production) -->
-
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <!-- JSF -->
-
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</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>
-
- <security-constraint>
- <display-name>Restrict raw XHTML Documents</display-name>
- <web-resource-collection>
- <web-resource-name>XHTML</web-resource-name>
- <url-pattern>*.xhtml</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>NONE</role-name>
- </auth-constraint>
- </security-constraint>
-
+<?xml version="1.0"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <!-- Ajax4jsf -->
+ <context-param>
+ <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
+ <param-value>com.sun.facelets.FaceletViewHandler</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.ajax4jsf.SKIN</param-name>
+ <param-value>blueSky</param-value>
+ </context-param>
+ <!-- Facelets development mode (disable in production) -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <!-- JSF -->
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <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>
+ <!-- Seam -->
+ <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>
+ <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>Seam Resource Servlet</servlet-name>
+ <url-pattern>/seam/resource/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <security-constraint>
+ <display-name>Restrict raw XHTML Documents</display-name>
+ <web-resource-collection>
+ <web-resource-name>XHTML</web-resource-name>
+ <url-pattern>/pages/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>NONE</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
</web-app>
Deleted: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp 2007-08-22 22:21:06 UTC (rev 2419)
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/index.jsp 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core"
+ prefix="c" %>
+<!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">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Richfaces examples and tests</title>
+</head>
+<body>
+<jsp:useBean id="pages" scope="application" class="org.ajax4jsf.PagesBean">
+ <jsp:setProperty name="pages" property="servletContext" value="${pageContext.servletContext}"/>
+ <jsp:setProperty name="pages" property="path" value="/pages"/>
+</jsp:useBean>
+<h2>JSF pages</h2>
+<ul>
+<c:forEach var="page" items="${pages.jspPages}">
+ <li><a href="${pageContext.request.contextPath}/faces${page.path}">${page.title}</a></li>
+</c:forEach>
+</ul>
+<h2>Facelets pages</h2>
+<ul>
+<c:forEach var="page" items="${pages.xhtmlPages}">
+ <li><a href="${pageContext.request.contextPath}/faces${page.path}">${page.title}</a></li>
+</c:forEach>
+</ul>
+</body>
+</html>
\ No newline at end of file
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/register.xhtml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/register.xhtml (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/register.xhtml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!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:s="http://jboss.com/products/seam/taglib"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <head>
+ <title>Register New User</title>
+ </head>
+ <body>
+ <f:view>
+ <h:form>
+ <s:validateAll>
+ <h:panelGrid columns="2">
+ Username: <h:inputText value="#{user.username}" required="true"/>
+ Real Name: <h:inputText value="#{user.name}" required="true"/>
+ Password: <h:inputSecret value="#{user.password}" required="true"/>
+ </h:panelGrid>
+ </s:validateAll>
+ <h:messages/>
+ <h:commandButton value="Register" action="#{register.register}"/>
+ </h:form>
+ </f:view>
+ </body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/register.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/registered.xhtml
===================================================================
--- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/registered.xhtml (rev 0)
+++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/registered.xhtml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!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:f="http://java.sun.com/jsf/core">
+
+ <head>
+ <title>Successfully Registered New User</title>
+ </head>
+ <body>
+ <f:view>
+ Welcome, #{user.name}, you are successfully registered as #{user.username}.
+ </f:view>
+ </body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/pages/registered.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/seamIntegration/pom.xml
===================================================================
--- trunk/samples/seamIntegration/pom.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamIntegration/pom.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?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">
@@ -10,9 +10,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.samples</groupId>
<artifactId>seamIntegration</artifactId>
- <version>3.1.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>seamIntegration Maven Webapp</name>
+ <version>3.1.0-SNAPSHOT</version>
<build>
<finalName>seamIntegration</finalName>
<plugins>
@@ -24,80 +24,81 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${seamHome}</directory>
+ <targetPath>WEB-INF/lib</targetPath>
+ <includes>
+ <include>jboss-seam.jar</include>
+ <include>jboss-seam-ui.jar</include>
+ <include>jboss-seam-debug.jar</include>
+ <include>
+ jboss-seam-remoting.jar
+ </include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${seamHome}/lib</directory>
+ <targetPath>WEB-INF/lib</targetPath>
+ <includes>
+ <include>jboss-el.jar</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>3.3.0.ga</version>
- <scope>provided</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.4.ga</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>3.0.0.ga</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>seam-core</artifactId>
<version>2.0.0.BETA</version>
+ <scope>system</scope>
<systemPath>${seamHome}/jboss-seam.jar</systemPath>
- <scope>system</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>seam-ui</artifactId>
<version>2.0.0.BETA</version>
+ <scope>system</scope>
<systemPath>${seamHome}/jboss-seam-ui.jar</systemPath>
- <scope>system</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-el</artifactId>
<version>2.0.0.BETA</version>
+ <scope>system</scope>
<systemPath>${seamHome}/lib/jboss-el.jar</systemPath>
- <scope>system</scope>
</dependency>
- <!--
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>seam-debug</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam-debug.jar</systemPath>
- <scope>system</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>seam-ioc</artifactId>
- <version>2.0.0.BETA</version>
- <systemPath>${seamHome}/jboss-seam-ioc.jar</systemPath>
- <scope>system</scope>
- </dependency>
- -->
<dependency>
<groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>3.4.ga</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.ga</version>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
+
Deleted: trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java
===================================================================
--- trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamIntegration/src/main/java/org/ajax4jsf/DummyTransaction.java 2007-08-22 22:21:06 UTC (rev 2419)
@@ -1,93 +0,0 @@
-/**
- *
- */
-package org.ajax4jsf;
-
-import static org.jboss.seam.annotations.Install.FRAMEWORK;
-
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.intercept.BypassInterceptors;
-import org.jboss.seam.transaction.AbstractUserTransaction;
-
-/**
- * @author asmirnov
- *
- */
- at Name("org.jboss.seam.transaction.transaction")
- at Scope(ScopeType.EVENT)
- at Install(value=false, precedence=FRAMEWORK)
- at BypassInterceptors
-public class DummyTransaction extends AbstractUserTransaction {
-
- /* (non-Javadoc)
- * @see org.jboss.seam.transaction.AbstractUserTransaction#registerSynchronization(javax.transaction.Synchronization)
- */
- @Override
- public void registerSynchronization(Synchronization arg0) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.UserTransaction#begin()
- */
- public void begin() throws NotSupportedException, SystemException {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.UserTransaction#commit()
- */
- public void commit() throws HeuristicMixedException,
- HeuristicRollbackException, IllegalStateException,
- RollbackException, SecurityException, SystemException {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.UserTransaction#getStatus()
- */
- public int getStatus() throws SystemException {
- // TODO Auto-generated method stub
- return Status.STATUS_NO_TRANSACTION;
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.UserTransaction#rollback()
- */
- public void rollback() throws IllegalStateException, SecurityException,
- SystemException {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.UserTransaction#setRollbackOnly()
- */
- public void setRollbackOnly() throws IllegalStateException, SystemException {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.UserTransaction#setTransactionTimeout(int)
- */
- public void setTransactionTimeout(int arg0) throws SystemException {
- // TODO Auto-generated method stub
-
- }
-
-}
Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml
===================================================================
--- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-08-22 20:00:52 UTC (rev 2418)
+++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-08-22 22:21:06 UTC (rev 2419)
@@ -16,7 +16,7 @@
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
- <core:init debug="true" jndi-pattern="seamIntegration/#{ejbName}/local"/>
+ <core:init debug="true" transaction-management-enabled="false"/>
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
More information about the richfaces-svn-commits
mailing list