[richfaces-svn-commits] JBoss Rich Faces SVN: r2330 - in trunk: samples/seamEAR and 11 other directories.

Author: alexsmirnov Date: 2007-08-17 20:53:12 -0400 (Fri, 17 Aug 2007) New Revision: 2330 Added: trunk/samples/seamEAR/ear/src/ trunk/samples/seamEAR/ear/src/main/ trunk/samples/seamEAR/ear/src/main/application/ trunk/samples/seamEAR/ear/src/main/application/META-INF/ trunk/samples/seamEAR/ear/src/main/application/META-INF/jboss-app.xml trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/persistence.xml trunk/samples/seamEAR/ejbs/src/main/resources/import.sql trunk/samples/seamEAR/ejbs/src/main/resources/seam.properties Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js trunk/samples/seamEAR/ear/pom.xml trunk/samples/seamEAR/ejbs/pom.xml trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml trunk/samples/seamEAR/pom.xml trunk/samples/seamEAR/wars/seamWebapp/pom.xml trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml Log: Set seam enterprise application example worked. Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-08-18 00:53:12 UTC (rev 2330) @@ -712,7 +712,7 @@ A4J.AJAX.replaceViewState(inputs,newinputs); } - if (typeof Event != "undefined" && typeof Event.unloadElementsCache === "function") { + if ((typeof Event != "undefined") && (typeof Event.unloadElementsCache === "function")) { Event.unloadElementsCache(); } Modified: trunk/samples/seamEAR/ear/pom.xml =================================================================== --- trunk/samples/seamEAR/ear/pom.xml 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamEAR/ear/pom.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -16,20 +16,14 @@ <dependencies> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>3.1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-api</artifactId> <version>3.1.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.richfaces.samples.seamEAR</groupId> @@ -63,12 +57,21 @@ <systemPath>${seamHome}/jboss-seam.jar</systemPath> <scope>system</scope> </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-el</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/lib/jboss-el.jar</systemPath> + <scope>system</scope> + </dependency> </dependencies> <build> + <finalName>seamEAR</finalName> <plugins> <plugin> <artifactId>maven-ear-plugin</artifactId> <configuration> + <defaultLibBundleDir>lib</defaultLibBundleDir> <modules> <jarModule> <groupId>jboss</groupId> @@ -76,13 +79,43 @@ <includeInApplicationXml> true </includeInApplicationXml> + <bundleDir>/</bundleDir> </jarModule> + <ejbModule> + <groupId> + org.richfaces.samples.seamEAR + </groupId> + <artifactId>ejbs</artifactId> + <bundleDir>/</bundleDir> + </ejbModule> + <jarModule> + <groupId>jboss</groupId> + <artifactId>jboss-el</artifactId> + <bundleDir>lib</bundleDir> + </jarModule> + <jarModule> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-api</artifactId> + <includeInApplicationXml> + true + </includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> </modules> - <archive> + <!-- + <archive> <manifest> - <addClasspath>true</addClasspath> + <addClasspath>true</addClasspath> </manifest> - </archive> + </archive> + --><!-- + <jboss> + <version>4.2</version> + <loader-repository> + seam.jboss.org:loader=seamEAR + </loader-repository> + </jboss> + --> <version>5</version> </configuration> </plugin> Added: trunk/samples/seamEAR/ear/src/main/application/META-INF/jboss-app.xml =================================================================== --- trunk/samples/seamEAR/ear/src/main/application/META-INF/jboss-app.xml (rev 0) +++ trunk/samples/seamEAR/ear/src/main/application/META-INF/jboss-app.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE jboss-app + PUBLIC "-//JBoss//DTD J2EE Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd"> + +<jboss-app> + <loader-repository> + seam.jboss.org:loader=seamEAR + </loader-repository> +</jboss-app> \ No newline at end of file Property changes on: trunk/samples/seamEAR/ear/src/main/application/META-INF/jboss-app.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Modified: trunk/samples/seamEAR/ejbs/pom.xml =================================================================== --- trunk/samples/seamEAR/ejbs/pom.xml 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamEAR/ejbs/pom.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -1,38 +1,42 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.samples.seamEAR</groupId> - <artifactId>ejbs</artifactId> - <packaging>ejb</packaging> - <version>3.1.0-SNAPSHOT</version> - <name>enterprise java beans</name> - <parent> - <groupId>org.richfaces.samples</groupId> - <artifactId>seamEAR</artifactId> - <version>3.1.0-SNAPSHOT</version> - </parent> - <dependencies> - <dependency> - <groupId>org.richfaces.samples.seamEAR</groupId> - <artifactId>primary-source</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.samples.seamEAR.projects</groupId> - <artifactId>logging</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-ejb-plugin</artifactId> - <configuration> - <ejbVersion>3.0</ejbVersion> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>ejbs</artifactId> + <packaging>ejb</packaging> + <version>3.1.0-SNAPSHOT</version> + <name>enterprise java beans</name> + <parent> + <groupId>org.richfaces.samples</groupId> + <artifactId>seamEAR</artifactId> + <version>3.1.0-SNAPSHOT</version> + </parent> + <dependencies> + <dependency> + <groupId>org.richfaces.samples.seamEAR</groupId> + <artifactId>primary-source</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.samples.seamEAR.projects</groupId> + <artifactId>logging</artifactId> + </dependency> + </dependencies> + <build> + <finalName>ejbs</finalName> + <plugins> + <plugin> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <ejbVersion>3.0</ejbVersion> + <archive> + <manifest> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/ejb-jar.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" + version="3.0"> + + <interceptors> + <interceptor> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor> + </interceptors> + + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> + +</ejb-jar> \ No newline at end of file Added: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/persistence.xml (rev 0) +++ trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/persistence.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Persistence deployment descriptor for dev profile --> +<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="seamEAR"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:/seamEARDatasource</jta-data-source> + <properties> + <property name="hibernate.hbm2ddl.auto" value="update" /> + <property name="hibernate.cache.use_query_cache" + value="true" /> + <property name="hibernate.show_sql" value="true" /> + <property name="jboss.entity.manager.factory.jndi.name" + value="java:/seamEAREntityManagerFactory" /> + </properties> + </persistence-unit> + +</persistence> Property changes on: trunk/samples/seamEAR/ejbs/src/main/resources/META-INF/persistence.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/samples/seamEAR/ejbs/src/main/resources/import.sql =================================================================== Added: trunk/samples/seamEAR/ejbs/src/main/resources/seam.properties =================================================================== Property changes on: trunk/samples/seamEAR/ejbs/src/main/resources/seam.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/samples/seamEAR/pom.xml =================================================================== --- trunk/samples/seamEAR/pom.xml 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamEAR/pom.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -1,9 +1,14 @@ -<project> - <parent> +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <!-- + <parent> <artifactId>samples</artifactId> <groupId>org.richfaces</groupId> <version>3.1.0-SNAPSHOT</version> - </parent> + </parent> + --> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.samples</groupId> <version>3.1.0-SNAPSHOT</version> Modified: trunk/samples/seamEAR/wars/seamWebapp/pom.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamEAR/wars/seamWebapp/pom.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -13,6 +13,7 @@ <version>3.1.0-SNAPSHOT</version> </parent> <build> + <finalName>seamWebapp</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -27,6 +28,9 @@ <includes> <include>jboss-seam-ui.jar</include> <include>jboss-seam-debug.jar</include> + <include> + jboss-seam-remoting.jar + </include> </includes> </resource> </webResources> @@ -47,6 +51,35 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</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-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> + <dependency> <groupId>org.richfaces.samples.seamEAR</groupId> <artifactId>primary-source</artifactId> <scope>provided</scope> @@ -112,6 +145,13 @@ </dependency> <dependency> <groupId>jboss</groupId> + <artifactId>seam-remoting</artifactId> + <version>2.0.0.BETA</version> + <systemPath>${seamHome}/jboss-seam-remoting.jar</systemPath> + <scope>system</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> <artifactId>javassist</artifactId> <version>3.4.ga</version> <scope>provided</scope> Modified: trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/components.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -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="@debug@" jndi-pattern="seamIntegration/#{ejbName}/local"/> + <core:init debug="true" jndi-pattern="seamEAR/#{ejbName}/local"/> <core:manager concurrent-request-timeout="500" conversation-timeout="120000" @@ -24,18 +24,13 @@ <persistence:managed-persistence-context name="entityManager" auto-create="true" - entity-manager-factory="#{seamIntegrationEntityManagerFactory}"/> + persistence-unit-jndi-name="java:/seamEAREntityManagerFactory"/> + <!-- + <persistence:entity-manager-factory name="seamEAREntityManagerFactory" + persistence-unit-name="seamEAR"/> + --> - <persistence:entity-manager-factory name="seamIntegrationEntityManagerFactory" - persistence-unit-name="seamIntegration"/> - - <drools:rule-base name="securityRules"> - <drools:rule-files><value>/security.drl</value></drools:rule-files> - </drools:rule-base> - - <security:identity authenticate-method="#{authenticator.authenticate}" - security-rules="#{securityRules}" - remember-me="true"/> + <security:identity authenticate-method="#{authenticator.authenticate}"/> <event type="org.jboss.seam.notLoggedIn"> <action expression="#{redirect.captureCurrentView}"/> 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-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamEAR/wars/seamWebapp/src/main/webapp/WEB-INF/web.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -0,0 +1,81 @@ +<?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> + +</web-app> Modified: trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml =================================================================== --- trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-08-17 22:43:26 UTC (rev 2329) +++ trunk/samples/seamIntegration/src/main/webapp/WEB-INF/components.xml 2007-08-18 00:53:12 UTC (rev 2330) @@ -16,11 +16,12 @@ 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="@debug@" jndi-pattern="seamIntegration/#{ejbName}/local"/> + <core:init debug="true" jndi-pattern="seamIntegration/#{ejbName}/local"/> <core:manager concurrent-request-timeout="500" conversation-timeout="120000" conversation-id-parameter="cid"/> + <!-- <persistence:managed-persistence-context name="entityManager" auto-create="true" @@ -46,7 +47,7 @@ <mail:mail-session host="localhost" port="2525" username="test" password="test" /> - <!-- For use with jBPM pageflow or process management --> + --><!-- For use with jBPM pageflow or process management --> <!-- <bpm:jbpm> <bpm:process-definitions></bpm:process-definitions>