Author: denis.forveille Date: 2009-07-31 16:59:23 -0400 (Fri, 31 Jul 2009) New Revision: 11329 Modified: branches/community/Seam_2_2/examples/jpa/build-websphere7.xml branches/community/Seam_2_2/examples/jpa/readme.txt branches/community/Seam_2_2/examples/jpa/resources-websphere7/META-INF/persistence.xml branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/web.xml Log: cleanup of jpa sample application on WebSphere v7 JBSEAM-4324 Modified: branches/community/Seam_2_2/examples/jpa/build-websphere7.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/build-websphere7.xml 2009-07-31 17:59:44 UTC (rev 11328) +++ branches/community/Seam_2_2/examples/jpa/build-websphere7.xml 2009-07-31 20:59:23 UTC (rev 11329) @@ -7,17 +7,16 @@ <property name="example.name" value="jboss-seam-jpa" /> <!-- resources --> - <property name="resources.dir" value="resources-websphere7" /> - <property name="dist.dir" value="dist-websphere7" /> + <property name="resources.dir" value="resources-websphere7" /> + <property name="dist.dir" value="dist-websphere7" /> <property name="exploded-archives.dir" value="exploded-archives-websphere7" /> <!-- Libraries to include --> - <property name="seam.ui.lib" value="true" /> + <property name="seam.ui.lib" value="true" /> <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - <property name="el-ri.lib" value="true" /> - <property name="jboss-common-core.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true" /> <import file="../build.xml" /> @@ -30,10 +29,7 @@ <include name="lib/commons-beanutils.jar" /> <include name="lib/commons-digester.jar" /> <include name="lib/commons-collections.jar" /> - <!-- JSF (and related) implementation --> - <!-- <include name="lib/jsf-api.jar"/>--> - <!-- <include name="lib/jsf-impl.jar" />--> - <!-- <include name="lib/el-api.jar" />--> + <include name="lib/log4j.jar" /> <!-- Hibernate and deps --> <include name="lib/hibernate-core.jar" /> @@ -43,9 +39,8 @@ <include name="lib/hibernate-validator.jar" /> <include name="lib/slf4j-api.jar" /> <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/asm.jar" /> <include name="lib/antlr.jar" /> + </fileset> <fileset id="noejb.war.extras" dir="${resources.dir}"> Modified: branches/community/Seam_2_2/examples/jpa/readme.txt =================================================================== --- branches/community/Seam_2_2/examples/jpa/readme.txt 2009-07-31 17:59:44 UTC (rev 11328) +++ branches/community/Seam_2_2/examples/jpa/readme.txt 2009-07-31 20:59:23 UTC (rev 11329) @@ -39,8 +39,8 @@ * See Weblogic reference guide chapter for full details. WebSphere 6.1: - * Install and run WebSphere 6.1 + * The "Default Applications" must be installed because this app will the Derby database that is installe with teh default application * Set a Websphere web container custom property "com.ibm.ws.webcontainer.invokefilterscompatibility" to true. See Seam reference guide chapter for details. * Set a Websphere web container custom property "prependSlashToResource" to true. See Seam reference guide chapter for details. * ant websphere61 @@ -49,6 +49,14 @@ * Start the application * Access it at http://localhost:9080/context_root/index.html +WebSphere 7.0: + * Install and run WebSphere 7.0 + * The "Default Applications" must be installed because this app will the Derby database that is installe with teh default application + * ant websphere7 + * Deploy dist-websphere7/jboss-seam-jpa.war and specify a context_root (choose the "fast path" and keep all the defaults) + * Start the application + * Access it at http://localhost:9080/<context_root> + Tomcat with JBoss Embedded: * Install Tomcat * Install JBoss Embedded Modified: branches/community/Seam_2_2/examples/jpa/resources-websphere7/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-websphere7/META-INF/persistence.xml 2009-07-31 17:59:44 UTC (rev 11328) +++ branches/community/Seam_2_2/examples/jpa/resources-websphere7/META-INF/persistence.xml 2009-07-31 20:59:23 UTC (rev 11329) @@ -7,7 +7,6 @@ <provider>org.hibernate.ejb.HibernatePersistence</provider> <jta-data-source>DefaultDatasource</jta-data-source> <properties> - <!-- From WAS 6.1.0.9, the embedded DB is switched to the same Derby DB in GlassFish --> <property name="hibernate.dialect" value="GlassfishDerbyDialect"/> <property name="hibernate.hbm2ddl.auto" value="create-drop"/> <property name="hibernate.show_sql" value="true"/> Modified: branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/web.xml 2009-07-31 17:59:44 UTC (rev 11328) +++ branches/community/Seam_2_2/examples/jpa/resources-websphere7/WEB-INF/web.xml 2009-07-31 20:59:23 UTC (rev 11329) @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" 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"> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Seam POJO Booking Example</display-name> + <!-- Seam --> <listener> @@ -20,20 +22,6 @@ <url-pattern>/*</url-pattern> </filter-mapping> - <filter> - <filter-name>RichFaces Filter</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - <init-param> - <param-name>enable-cache</param-name> - <param-value>false</param-value> - </init-param> - </filter> - - <filter-mapping> - <filter-name>RichFaces 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> @@ -72,12 +60,14 @@ <param-value>true</param-value> </context-param> - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - <session-config> <session-timeout>10</session-timeout> </session-config> + <!-- Welcome File --> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + </web-app>