[seam-commits] Seam SVN: r11289 - in branches/enterprise/JBPAPP_5_0/examples: booking and 23 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Tue Jul 14 08:06:15 EDT 2009


Author: manaRH
Date: 2009-07-14 08:06:14 -0400 (Tue, 14 Jul 2009)
New Revision: 11289

Removed:
   branches/enterprise/JBPAPP_5_0/examples/hibernate/build-glassfish.xml
   branches/enterprise/JBPAPP_5_0/examples/hibernate/build-jboss405.xml
   branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat55.xml
   branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat6.xml
   branches/enterprise/JBPAPP_5_0/examples/hibernate/build-weblogic92.xml
   branches/enterprise/JBPAPP_5_0/examples/hibernate/build-websphere61.xml
   branches/enterprise/JBPAPP_5_0/examples/hibernate/resources-glassfish/
   branches/enterprise/JBPAPP_5_0/examples/hibernate/resources-tomcat/
   branches/enterprise/JBPAPP_5_0/examples/hibernate/resources-weblogic92/
   branches/enterprise/JBPAPP_5_0/examples/hibernate/resources-websphere61/
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-glassfish.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss-embedded.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss405.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat55.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat6.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic10.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic92.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere61.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere7.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/resources-glassfish/
   branches/enterprise/JBPAPP_5_0/examples/jpa/resources-tomcat/
   branches/enterprise/JBPAPP_5_0/examples/jpa/resources-weblogic10/
   branches/enterprise/JBPAPP_5_0/examples/jpa/resources-weblogic92/
   branches/enterprise/JBPAPP_5_0/examples/jpa/resources-websphere61/
   branches/enterprise/JBPAPP_5_0/examples/jpa/resources-websphere7/
Modified:
   branches/enterprise/JBPAPP_5_0/examples/booking/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/build.xml
   branches/enterprise/JBPAPP_5_0/examples/contactlist/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/dvdstore/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/excel/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/groovybooking/build.properties
   branches/enterprise/JBPAPP_5_0/examples/hibernate/build.xml
   branches/enterprise/JBPAPP_5_0/examples/hibernate/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/itext/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml
   branches/enterprise/JBPAPP_5_0/examples/jee5/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/jee5/remoting/build.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/build.xml
   branches/enterprise/JBPAPP_5_0/examples/jpa/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/mail/build.xml
   branches/enterprise/JBPAPP_5_0/examples/metawidget/booking/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/metawidget/dvdstore/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/metawidget/groovybooking/build.properties
   branches/enterprise/JBPAPP_5_0/examples/numberguess/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/registration/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/remoting/chatroom/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/remoting/helloworld/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/seambay/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/seamdiscs/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/seampay/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/seamspace/readme.txt
   branches/enterprise/JBPAPP_5_0/examples/spring/readme.txt
Log:
JBPAPP-2155

Modified: branches/enterprise/JBPAPP_5_0/examples/booking/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/booking/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/booking/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -5,7 +5,7 @@
 Transaction and persistence context management is handled by the
 EJB container.
 
-This example runs on JBoss AS as an EAR or Tomcat with JBoss Embedded as a WAR.
+This example runs on JBoss AS as an EAR.
 
  example.name=booking
 

Modified: branches/enterprise/JBPAPP_5_0/examples/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/build.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/build.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -35,7 +35,6 @@
 
 	<!-- Deployment directories -->
 	<property name="deploy.dir" value="${jboss.home}/server/default/deploy" />
-	<property name="tomcat.deploy.dir" value="${tomcat.home}/webapps" />
 	<property name="farm.deploy.dir" value="${jboss.home}/server/all/farm" />
 	<property name="conf.dir" value="${jboss.home}/server/default/conf" />
 
@@ -104,16 +103,6 @@
 		<exclude name="**/*" />
 	</fileset>
 
-	<!-- Added to the tomcat war root on build -->
-	<fileset id="tomcat.war.extras" dir=".">
-		<exclude name="**/*" />
-	</fileset>
-
-	<!-- Added to the tomcat jar root on build -->
-	<fileset id="tomcat.jar.extras" dir=".">
-		<exclude name="**/*" />
-	</fileset>
-
 	<!-- Added to the non-ejb war lib on build -->
 	<fileset id="noejb.war.lib.extras" dir=".">
 		<exclude name="**/*" />
@@ -151,11 +140,6 @@
 		<include name="commons-beanutils.jar" if="seam.ui.lib" unless="richfaces.lib" />
 	</fileset>
 	
-	<!-- tomcat needs in messages example jstl.jar -->
-	<fileset dir="${lib.dir}" id="tomcat-standard-tag.jar">
-	    <include name="jstl.jar" if="tomcat.standard.tag"/>
-	</fileset>
-
 	<!-- Seam  pdf, with required dependencies -->
 	<fileset id="seam.pdf.jar" dir="${lib.dir}">
 		<include name="jboss-seam-pdf.jar" if="seam.pdf.lib" />
@@ -298,11 +282,6 @@
 		<include name="jbpm-jpdl.jar" if="jbpm.lib" />
 	</fileset>	
 
-	<!-- Dependencies for using Seam with JBPM on Tomcat-->
-	<fileset id="tomcat.jbpm.jar" dir="${lib.dir}">
-		<include name="bsh.jar" if="jbpm.lib" />
-	</fileset>
-
 	<!-- Dependencies for using Seam with JBoss Cache (s:cache) -->
 	<fileset id="cache.jar" dir="${lib.dir}">
 		<include name="jboss-cache.jar" if="cache.lib" />
@@ -413,27 +392,6 @@
 	    <include name="concurrent.jar" if="jboss-common-core.lib" />
 	</fileset>
 	
-	<!-- ############################ MELDWARE ############################ -->
-	<!--
-	  Meldware from buni.org provides a java based mail server which Seam uses
-	  to demonstrate it's mail capabilities.  It's unlike other dependencies as
-	  it is deployed as a number of standalone wars, rars and ears.
-	-->
-
-	<!-- Meldware configuration -->
-	<patternset id="meldware.conf.files">
-		<exclude name="**/*" unless="deploy.meldware.mail" />
-		<include name="meldware.store" if="deploy.meldware.mail" />
-	</patternset>
-
-	<!-- Just the mail portion of meldware -->
-	<patternset id="meldware.files">
-		<exclude name="**/*" unless="deploy.meldware.mail" />
-		<include name="_mail.ear" if="deploy.meldware.mail" />
-		<include name="meldwarebase.sar" if="deploy.meldware.mail" />
-	</patternset>
-
-
 	<!-- ############### RESOURCES FOR EXAMPLES ################ -->
 	<!--
 	  A number of configuration files are needed for Seam, and it's 
@@ -479,15 +437,6 @@
 			<include name="*.xls" />
 		</fileset>
 
-	<!-- resources to go in the jar for tomcat  -->
-	<fileset id="tomcat.jar.resources" dir="${resources.dir}">
-		<include name="${example.ds}" />
-		<include name="treecache.xml" />
-		<include name="*.jpdl.xml" />
-		<include name="jbpm.cfg.xml" />
-		<include name="hibernate.cfg.xml" />
-	</fileset>
-
 	<!-- resources to go in the jar for jbosswar  -->
 	<fileset id="noejb.jar.resources" dir="${resources.dir}">
 		<include name="${example.ds}" />
@@ -682,7 +631,6 @@
 			<fileset refid="seam.ioc.jar" />
 			<fileset refid="seam.mail.jar" />
 			<fileset refid="seam.excel.jar" />
-			<fileset refid="seam.rss.jar" />
 			<fileset refid="seam.pdf.jar" />
 			<fileset refid="seam.ui.jar" />
 			<fileset refid="facelets.jar" />
@@ -692,7 +640,6 @@
 			<fileset refid="metawidget-frontend.jar" />
 			<fileset refid="jboss-common-core.jar" />
 			<fileset refid="war.lib.extras" />
-			<fileset refid="tomcat-standard-tag.jar" />
 			<mapper type="flatten" />
 		</copy>
 		<!-- Put properties into the classpath -->
@@ -923,76 +870,6 @@
 
 	<target name="restartclean" depends="clean, unexplode, restart" description="Clean the example and restart it" />
 
-	<!-- #################### BUILD TARGETS (TOMCAT) #################### -->
-
-
-	<target name="tomcat.warn">
-		<echo message="If you built for JBoss AS, remember to run clean before building for Tomcat" />
-		<echo message="Remember to configure Embedded JBoss" />
-	</target>
-
-	<target name="tomcat.jar" depends="jar">
-		<copy todir="${jar.dir}">
-			<fileset refid="tomcat.jar.resources" />
-		</copy>
-	</target>
-
-	<!-- Extend the standard war target to add extras which Tomcat needs -->
-	<target name="tomcat.war" depends="war">
-		<copy todir="${war.dir}/WEB-INF/lib">
-			<fileset refid="seam.jar" />
-			<fileset refid="tomcat.war.extras" />
-			<fileset refid="cglib.jar" />
-			<fileset refid="drools.jar" />
-			<fileset refid="cache.jar" />
-			<fileset refid="jbpm.jar" />
-			<fileset refid="tomcat.jbpm.jar" />
-			<fileset refid="seam.remoting.jar" />
-			<fileset refid="spring.jar" />
-			<fileset refid="gwt.jar" />
-			<fileset refid="openid.jar" />
-			<fileset refid="jboss-el.jar" />
-			<fileset refid="jsf.jar" />
-			<fileset refid="search.jar" />
-			<fileset refid="richfaces-api.jar" />
-			<fileset refid="seam.pdf.extra.jar" />
-			<mapper type="flatten" />
-		</copy>
-		<!-- Copy in resources, with filtering -->
-		<copy todir="${war.dir}">
-			<fileset refid="war.resources" />
-			<filterset>
-				<filter token="debug" value="${debug}" />
-				<filter token="distributable" value="${distributable}" />
-				<filter token="jndiPattern" value="#{ejbName}/local" />
-			</filterset>
-		</copy>
-	</target>
-
-	<target name="tomcat.archive" depends="tomcat.warn,tomcat.jar,tomcat.war" description="Package the archives for tomcat">
-		<jar jarfile="${dist.dir}/${example.name}.jar" basedir="${jar.dir}" />
-		<jar jarfile="${dist.dir}/${example.name}.war">
-			<fileset dir="${war.dir}" />
-			<zipfileset dir="${dist.dir}" prefix="WEB-INF/lib">
-				<include name="${example.name}.jar" />
-			</zipfileset>
-		</jar>
-	</target>
-
-	<target name="tomcat.deploy" depends="tomcat.archive" description="Deploy the example to Tomcat">
-
-		<fail unless="tomcat.home">
-			tomcat.home not set, update build.properties
-		</fail>
-		<copy file="${dist.dir}/${example.name}.war" todir="${tomcat.deploy.dir}" />
-	</target>
-
-	<target name="tomcat.undeploy" description="Undeploy the example from Tomcat">
-		<delete file="${tomcat.deploy.dir}/${example.name}.war" />
-	</target>
-
-
-
 	<!-- #################### BUILD TARGETS (NOEJB) ##################### -->
 
 	<target name="noejb.jar" depends="jar">

Modified: branches/enterprise/JBPAPP_5_0/examples/contactlist/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/contactlist/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/contactlist/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,6 +2,6 @@
 =========================
 
 This example demonstrates the Seam CRUD framework. It runs on JBoss AS as an
-EAR and Tomcat with JBoss Embedded as a WAR.
+EAR.
 
 example.name=contactlist

Modified: branches/enterprise/JBPAPP_5_0/examples/dvdstore/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/dvdstore/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/dvdstore/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,7 +2,6 @@
 ======================
 
 This example demonstrates the use of Seam with jBPM pageflow and business
-process management. It runs on JBoss AS as an EAR and Tomcat with Embedded
-JBoss as a WAR.
+process management. It runs on JBoss AS as an EAR.
 
 example.name=dvdstore

Modified: branches/enterprise/JBPAPP_5_0/examples/excel/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/excel/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/excel/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,6 +2,6 @@
 ==================
 
 This example demonstrates the Seam Excel functionality. It runs on JBoss AS as
-an EAR and Tomcat with Embedded JBoss as a WAR.
+an EAR.
 
 example.name=excel

Modified: branches/enterprise/JBPAPP_5_0/examples/groovybooking/build.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/groovybooking/build.properties	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/groovybooking/build.properties	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,2 +1,2 @@
 # Uncomment when deploying to JBoss AS 5
-#loadPersistenceUnits=false
+loadPersistenceUnits=true

Deleted: branches/enterprise/JBPAPP_5_0/examples/hibernate/build-glassfish.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/build-glassfish.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/build-glassfish.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Hibernate Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The Hibernate Example for GlassFish"/>
-    <property name="example.name"           value="jboss-seam-hibernate"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-glassfish" />
-	<property name="dist.dir" value="dist-glassfish" />
-	<property name="exploded-archives.dir" value="exploded-archives-glassfish" />
-       
-    <!-- Libraries to include -->
-    <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="jboss-common-core.lib" value="true" />
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-    	<!-- Seam deps -->
-    	<include name="lib/javassist.jar"/>
-    	<include name="lib/dom4j.jar" />
-    	
-    	<!-- Hibernate and deps -->
-        <include name="lib/hibernate.jar"/>
-    	<include name="lib/hibernate-commons-annotations.jar"/>
-        <include name="lib/hibernate-annotations.jar"/>
-    	<include name="lib/hibernate-entitymanager.jar"/>
-    	<include name="lib/hibernate-validator.jar"/>
-    	
-        <include name="lib/asm.jar" />
-    	<include name="lib/cglib.jar"/>
-    	<include name="lib/antlr.jar" />
-    	<include name="lib/commons-logging.jar" />
-    	<include name="lib/commons-collections.jar" />
-    </fileset>
-	
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="WEB-INF/classes/**/*" />
-	</fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/hibernate/build-jboss405.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/build-jboss405.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/build-jboss405.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Hibernate Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The Hibernate Example for JBoss 4.0.5"/>
-    <property name="example.name"           value="jboss-seam-hibernate"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-jboss" />
-	<property name="dist.dir" value="dist-jboss405" />
-	<property name="exploded-archives.dir" value="exploded-archives-jboss405" />
-       
-    <!-- Libraries to include -->
-    <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"/>
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-        <include name="lib/commons-beanutils.jar"/>
-        <include name="lib/commons-collections.jar"/>
-        <include name="lib/commons-digester.jar"/>
-        <include name="lib/commons-lang.jar"/>
-        <include name="lib/commons-logging.jar"/>
-        <include name="lib/jsf-api.jar"/>
-        <include name="lib/jsf-impl.jar"/>
-        <include name="lib/jstl.jar"/>
-        <include name="lib/el-api.jar"/>
-    </fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat55.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat55.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat55.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Hibernate Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The Hibernate Example for plain Tomcat 5.5"/>
-    <property name="example.name"           value="jboss-seam-hibernate"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-tomcat" />
-	<property name="dist.dir" value="dist-tomcat55" />
-	<property name="exploded-archives.dir" value="exploded-archives-tomcat55" />
-       
-    <!-- Libraries to include -->
-    <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"/>
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-        <include name="lib/commons-beanutils.jar"/>
-        <include name="lib/commons-collections.jar"/>
-        <include name="lib/commons-digester.jar"/>
-        <include name="lib/commons-lang.jar"/>
-        <include name="lib/commons-logging.jar"/>
-        <include name="lib/jsf-api.jar"/>
-    	<include name="lib/jsf-impl.jar"/>
-        <include name="lib/jstl.jar"/>
-    	<include name="lib/dom4j.jar" />
-        <include name="lib/hibernate.jar"/>
-    	<include name="lib/hibernate-commons-annotations.jar"/>
-        <include name="lib/hibernate-annotations.jar"/>
-    	<include name="lib/hibernate-entitymanager.jar"/>
-    	<include name="lib/hibernate-validator.jar"/>
-        <include name="lib/javassist.jar"/>
-    	<include name="lib/persistence-api.jar" />
-    	<include name="lib/el-api.jar" />
-        <include name="lib/cglib.jar"/>
-        <include name="lib/jta.jar"/>
-    	<include name="lib/antlr.jar" />
-        <!--
-        <include name="examples/hibernate2/lib/mc/*.jar"/>
-        -->
-    </fileset>
-	
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="META-INF/context.xml" />
-	</fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat6.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat6.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/build-tomcat6.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Hibernate Booking" default="noejb.archive" basedir=".">
-
-	<!-- Naming -->
-	<property name="Name" value="The Hibernate Example for plain Tomcat 6.0" />
-	<property name="example.name" value="jboss-seam-hibernate" />
-
-	<!-- resources -->
-	<property name="resources.dir" value="resources-tomcat" />
-	<property name="dist.dir" value="dist-tomcat6" />
-	<property name="exploded-archives.dir" value="exploded-archives-tomcat6" />
-
-	<!-- Libraries to include -->
-	<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" />
-
-	<import file="../build.xml" />
-
-	<fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-		<include name="lib/commons-beanutils.jar"/>
-        <include name="lib/commons-collections.jar"/>
-        <include name="lib/commons-digester.jar"/>
-        <include name="lib/commons-lang.jar"/>
-        <include name="lib/commons-logging.jar"/>
-		<include name="lib/jsf-api.jar" />
-		<include name="lib/jsf-impl.jar" />
-		<include name="lib/jstl.jar" />
-		<include name="lib/dom4j.jar" />
-		<include name="lib/hibernate.jar" />
-		<include name="lib/hibernate-commons-annotations.jar" />
-		<include name="lib/hibernate-annotations.jar" />
-		<include name="lib/hibernate-entitymanager.jar" />
-		<include name="lib/hibernate-validator.jar" />
-        <include name="lib/asm.jar" />
-		<include name="lib/javassist.jar" />
-		<include name="lib/persistence-api.jar" />
-		<include name="lib/cglib.jar" />
-		<include name="lib/jta.jar" />
-		<include name="lib/antlr.jar" />
-	</fileset>
-
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="META-INF/context.xml" />
-	</fileset>
-
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/hibernate/build-weblogic92.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/build-weblogic92.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/build-weblogic92.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Hibernate Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The Hibernate Example for WebLogic 9.2"/>
-    <property name="example.name"           value="jboss-seam-hibernate"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-weblogic92" />
-	<property name="dist.dir" value="dist-weblogic92" />
-	<property name="exploded-archives.dir" value="exploded-archives-weblogic92" />
-       
-    <!-- Libraries to include -->
-    <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" />
-
-    <import file="../build.xml"/>
-
-	<fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-	      <!-- Seam deps -->
-	      <include name="lib/dom4j.jar" />
-	      <include name="lib/javassist.jar" />
-
-	      <!-- Misc -->
-	      <include name="lib/jta.jar" />
-	      <include name="lib/commons-beanutils.jar" />
-	      <include name="lib/commons-digester.jar" />
-	      <include name="lib/commons-collections.jar" />
-	      <include name="lib/commons-logging.jar" />
-	      <!-- JSF (and related) implementation -->
-	      <include name="lib/jsf-api.jar" />
-	      <include name="lib/jsf-impl.jar" />
-	      <include name="lib/jstl.jar" />
-	      <include name="lib/el-api.jar" />
-
-	      <!-- Hibernate and deps -->
-	      <include name="lib/hibernate.jar" />
-	      <include name="lib/hibernate-commons-annotations.jar" />
-	      <include name="lib/hibernate-annotations.jar" />
-	      <include name="lib/hibernate-entitymanager.jar" />
-	      <include name="lib/hibernate-validator.jar" />
-	      <include name="lib/persistence-api.jar" />
-	      <include name="lib/cglib.jar" />
-	      <include name="lib/antlr.jar" />
-	    </fileset>
-	
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="WEB-INF/classes/**/*" />
-	</fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/hibernate/build-websphere61.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/build-websphere61.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/build-websphere61.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Hibernate Booking" default="noejb.archive" basedir=".">
-
-	<!-- Naming -->
-	<property name="Name" value="The Hibernate Example for WebSphere 6.1.0.9" />
-	<property name="example.name" value="jboss-seam-hibernate" />
-
-	<!-- resources -->
-	<property name="resources.dir" value="resources-websphere61" />
-	<property name="dist.dir" value="dist-websphere61" />
-	<property name="exploded-archives.dir" value="exploded-archives-websphere61" />
-
-	<!-- Libraries to include -->
-	<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" />
-
-	<import file="../build.xml" />
-
-	    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-        <!-- Seam deps -->
-        <include name="lib/dom4j.jar" />
-        <include name="lib/javassist.jar"/>
-        
-        <!-- Misc -->
-        <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/jstl.jar"/>
-        <include name="lib/el-api.jar" />  
-        
-        <!-- Hibernate and deps -->
-        <include name="lib/hibernate.jar"/>
-        <include name="lib/hibernate-commons-annotations.jar"/>
-        <include name="lib/hibernate-annotations.jar"/>
-        <include name="lib/hibernate-entitymanager.jar"/>
-        <include name="lib/hibernate-validator.jar"/>
-        <include name="lib/persistence-api.jar" />
-        <include name="lib/cglib.jar"/>
-        <include name="lib/antlr.jar" /> 
-    </fileset>
-
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="WEB-INF/classes/**/*" />
-		<include name="META-INF/*.taglib.xml" />
-	</fileset>
-
-</project>
-

Modified: branches/enterprise/JBPAPP_5_0/examples/hibernate/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/build.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/build.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -18,50 +18,13 @@
         <ant antfile="build-jboss.xml" target="jbosswar.undeploy"/>
    </target>
 
-   <target name="jboss405" description="Build the Hibernate Booking example artifacts, suitable for deployment to JBoss 4.0.5.GA">
-     	<ant antfile="build-jboss405.xml"/>
-   </target>
 
-   <target name="glassfish" description="Build the Hibernate Booking example artifacts, suitable for deployment to GlassFish V2">
-     	<ant antfile="build-glassfish.xml"/>
-   </target>
-
-   <target name="weblogic92" description="Build the Hibernate Booking example artifacts, suitable for deployment to WebLogic 9.2">
-     	<ant antfile="build-weblogic92.xml"/>
-   </target>
-
-   <target name="websphere61" description="Build the Hibernate Booking example artifacts, suitable for deployment to WebSphere 6.1.0.9">
-     	<ant antfile="build-websphere61.xml"/>
-   </target>
-
-   <target name="tomcat55" description="Build the Hibernate Booking example artifacts, suitable for deployment to Tomcat 5.5">
-     	<ant antfile="build-tomcat55.xml"/>
-   </target>
-
-   <target name="tomcat6" description="Build the Hibernate Booking example artifacts, suitable for deployment to Tomcat 6">
-     	<ant antfile="build-tomcat6.xml"/>
-   </target>
-	
-	<target name="tomcat6.deploy" depends="tomcat6" description="Deploy to Tomcat 6.0">
-		<ant antfile="build-tomcat6.xml" target="tomcat.deploy"/>
-	</target>
-	
-	<target name="tomcat6.undeploy" description="Undeploy from Tomcat 6.0">
-		<ant antfile="build-tomcat6.xml" target="tomcat.undeploy"/>
-	</target>
-
    <target name="clean" description="Clean up the example">
      	<ant antfile="build-jboss.xml" target="clean" />
-    	<ant antfile="build-jboss405.xml" target="clean" />
-    	<ant antfile="build-glassfish.xml" target="clean" />
-    	<ant antfile="build-weblogic92.xml" target="clean" />
-    	<ant antfile="build-websphere61.xml" target="clean" />
-    	<ant antfile="build-tomcat55.xml" target="clean" />
-    	<ant antfile="build-tomcat6.xml" target="clean" />
         <ant antfile="build-jboss-embedded.xml" target="clean" />
    </target>
 
-   <target name="all" depends="jboss, jboss405, glassfish, weblogic92, websphere61, tomcat55, tomcat6" description="Build Hibernate Booking example, for deployment to all supported application servers"/>
+   <target name="all" depends="jboss" description="Build Hibernate Booking example, for deployment to all supported application servers"/>
    
    <target name="test">
       <ant antfile="build-jboss.xml" target="test" />

Modified: branches/enterprise/JBPAPP_5_0/examples/hibernate/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/hibernate/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/hibernate/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,49 +2,14 @@
 =======================
 
 This is the Hotel Booking example implemented in Seam and Hibernate POJOs.
-It can be deployed in JBoss AS 4.x, WebLogic, GlassFish and Tomcat without
-the EJB3 container.
 
-JBoss AS 4.2.x:
+JBoss EAP 5:
   * Install JBoss AS with the default profile
   * ant jboss
   * Start JBoss AS 
   * Access the app at http://localhost:8080/jboss-seam-hibernate/
   * ant jboss.undeploy
 
-JBoss AS 4.0.5.GA:
-  * Install JBoss AS with the default profile (with or without EJB3)
-  * ant jboss405
-  * Deploy dist-jboss/jboss-seam-hibernate.war
-  * Start JBoss AS 
-  * Access the app at http://localhost:8080/jboss-seam-hibernate/
-
-WebLogic 9.2:
-  * Install WebLogic 9.2
-  * ant weblogic92
-  * Start the WebLogic "examples" server
-  * Load the admin console http://localhost:7001/console/
-  * Deploy dist-weblogic92/jboss-seam-hibernate.war
-  * Access the app at http://localhost:7001/jboss-seam-hibernate/
-
-WebSphere 6.1: (Special thanks to Denis Forveille)
-
-  * Install and run WebSphere 6.1
-  * In Application Servers -> <server> -> Web Container Settings -> Web Container -> Custom Properties, set "com.ibm.ws.webcontainer.invokefilterscompatibility" to "true"
-  * ant websphere61
-  * Install dist-websphere61/jboss-seam-hibernate.war and specify a context_root
-  * From the "Enterprise Applications" list select: "jboss-seam-hibernate_war" --> "Manager Modules" --> "jboss-seam-hibernate.war" --> "Classes loaded with application class loader first", and then Apply
-  * Start the application
-  * Access it at http://localhost:9080/context_root/index.html
-
-Plain Tomcat (special thanks to Ralph Schaer)
-  * Install Tomcat 5.5 or Tomcat 6
-  * Copy the lib/hsqldb.jar into $TOMCAT_HOME/common/lib (Tomcat 5.5) or $TOMCAT_HOME/lib (Tomcat 6)
-  * ant tomcat
-  * Deploy dist-tomcat55/jboss-seam-hibernate.war or dist-tomcat6/jboss-seam-hibernate.war to $TOMCAT_HOME/webapps/jboss-seam-hibernate.war
-  * Start Tomcat
-  * Access the app at http://localhost:8080/jboss-seam-hibernate/
-
 Tomcat with embeddable JBoss:
   * Install Tomcat
   * Install Embeddable JBoss
@@ -52,30 +17,3 @@
   * Deploy dist-jboss-embedded/jboss-seam-hibernate.war
   * Start Tomcat
   * Access the app at http://localhost:8080/jboss-seam-hibernate/
-
-GlassFish
-  * Install GlassFish V1 or V2
-  * ant glassfish
-  * Start GlassFish and the Embedded Derby Database
-  * Load the admin console http://localhost:4848/
-  * Deploy dist-glassfish/jboss-seam-hibernate.war as Web App
-  * Access the app at http://localhost:8080/jboss-seam-hibernate/
-
-GlassFish:
-  * Install GlassFish V1 or V2
-  * ant glassfish
-  * Start GlassFish and the Embedded Derby Database
-  * Load the admin console http://localhost:4848/
-  * Deploy dist-glassfish/jboss-seam-hibernate.war in the Admin Console (Applications > Web Applications)
-    or using the command $GLASSFISH_HOME/bin/asadmin deploy dist-glassfish/jboss-seam-hibernate.war
-  * Access the app at http://localhost:8080/jboss-seam-hibernate/
-
-NOTES FOR GLASSFISH USERS:
-  In order for the app to work out of the box with GlassFish, we have
-  used the Derby (i.e., Java DB) database in GlassFish. The included
-  WEB-INF/classes/GlassfishDerbyDialect.class is a special hack to get
-  around a Derby bug in GlassFish V2. You must use it as your Hibernate
-  dialect if you use Derby with GlassFish.
-  
-  However, we strongly recommend you to use a non-Derby data source if
-  possible (for example, HSQL is a much better embedded DB).

Modified: branches/enterprise/JBPAPP_5_0/examples/itext/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/itext/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/itext/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,6 +2,6 @@
 ==================
 
 This example demonstrates the Seam PDF functionality. It runs on JBoss AS as an
-EAR and Tomcat with Embedded JBoss as a WAR.
+EAR.
 
 example.name=itext

Modified: branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jee5/booking/build.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -17,15 +17,6 @@
     <property name="facelets.lib"   value="true"/>
     <property name="richfaces.lib"   value="true"/>
     <property name="jboss-common-core.lib" value="true" />
-    <!-- add libs for oc4j (broken classloading) -->
-    <!--
-    <property name="jbpm.lib" value="true"/>
-    <property name="drools.lib" value="true"/>
-    <property name="quartz.lib" value="true" />
-    <property name="search.lib" value="true" />
-    <property name="dbunit.lib" value="true" />
-    <property name="jboss-embedded-api.lib" value="true" />
-    -->
   
     <import file="../../build.xml"/>
 

Modified: branches/enterprise/JBPAPP_5_0/examples/jee5/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jee5/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jee5/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -3,143 +3,4 @@
 
 The examples in this directory showcases how to build Java EE 5 compliant Seam 
 applications. The application should run on all Java EE 5 compliant 
-application servers with minimal changes in code and configuration files. The 
-default build script builds a deployable EAR for GlassFish. See Seam reference
-guide for instructions for other containers.
-
-GlassFish V2 
-------------
-
-1. Modify the following files in the project.
-
-   * resources/META-INF/persistence.xml: Change the jta-persistence-provider to the commented
-     out Glassfish property
-
-2.  Build the demo app by running Ant. The build target is 
-    "dist/jboss-seam-jee5.ear" 
-
-3.  Download GlassFish V2 Final Build
-
-4.  Install it: java -Xmx256m -jar glassfish-installer-xxx.jar
-
-5.  Setup glassfish: cd glassfish; ant -f setup.xml;
-
-6.  Start the GlassFish server: $GLASSFISH_HOME/bin/asadmin start-domain domain1
-
-7.  Start the embedded JavaDB: $GLASSFISH_HOME/bin/asadmin start-database
-
-8.  Load the admin console: http://localhost:4848/
-
-9.  Login using username/password: admin / adminadmin
-
-10.  Deploy the "Enterprise Application" in the admin console
-    or using the command $GLASSFISH_HOME/bin/asadmin deploy dist/jboss-seam-jee5.ear
-
-11. Checkout the app at: http://localhost:8080/seam-jee5/
-
-12. Stop the server and database: 
-    $GLASSFISH_HOME/bin/asadmin stop-domain domain1; $GLASSFISH_HOME/bin/asadmin stop-database
-
-
-OC4J 11g Technology Preview
----------------------------
-
-1.  Modify the following files in the project.
-  
-    * build.xml: Un-comment the OC4J-related libraries
-    * resources/META-INF/persistence.xml: un-comment the OC4J properties
-
-2.  Build the demo app by running ANT. The build target is 
-    "dist/jboss-seam-jee5.ear"
-
-3.  Download OC4J 11g Technology Preview from here 
-    http://www.oracle.com/technology/tech/java/oc4j/11/index.html
-
-4.  Unzip the downloaded file
-
-5.  Make sure you have $JAVA_HOME and $ORACLE_HOME set as environment 
-    variables ($ORACLE_HOME is the directory to which you unzip OC4J). For 
-    further information on installing OC4J, consult the Readme.txt distributed 
-    with OC4J
-
-6.  Edit the OC4J datasource $ORACLE_HOME/j2ee/home/config/data-sources.xml 
-    and, inside <data-sources>, add
-
-    <managed-data-source 
-      connection-pool-name="jee5-connection-pool" 
-      jndi-name="jdbc/__default" 
-      name="jee5-managed-data-source"
-      />
-    <connection-pool name="jee5-connection-pool">
-      <connection-factory 
-        factory-class="org.hsqldb.jdbcDriver" 
-        user="sa" 
-        password="" url="jdbc:hsqldb:." 
-        />
-    </connection-pool>
-
-
-7.  Edit $ORACLE_HOME/j2ee/home/config/server.xml and, inside 
-    <application-server>, add
-
-    <application 
-      name="jboss-seam-jee5" 
-      path="../../home/applications/jboss-seam-jee5.ear" 
-      parent="default" 
-      start="true" 
-      />
-
-8.  Edit $ORACLE_HOME/j2ee/home/config/default-web-site.xml, and, inside 
-    <web-site>, add
-
-    <web-app 
-      application="jboss-seam-jee5" 
-      name="jboss-seam-jee5" 
-      load-on-startup="true" 
-      root="/seam-jee5" 
-      />
-
-9.  Copy hsqldb.jar to OC4J: 
-    cp ../../lib/hsqldb.jar $ORACLE_HOME/j2ee/home/applib/
-
-10. Copy the application to OC4J: 
-    cp build/jboss-seam-jee5.ear $ORACLE_HOME/j2ee/home/applications/
-
-11. Start OC4J: $ORACLE_HOME/j2ee/home/java -jar -XX:MaxPermSize=256M oc4j.jar
-    * You must override the default PermGen memory settings using above command
-       * See http://www.oracle.com/technology/tech/java/oc4j/11/oc4j-relnotes.html
-    * You will be asked to set the admin password if this is the first time 
-      you've started OC4J
-    * You may get an ClassNotFoundException relating to 
-      org.jboss.logging.util.OnlyOnceErrorHandler, this doesn't impact on the 
-      running of the app.  We are working to get rid of this error!
-
-12. Checkout the app at: http://localhost:8888/seam-jee5
-
-13. You can stop the server by pressing CTRL-c in the console on which the 
-    server is running.
-
-
-Workarounds for OC4J 11g
-------------------------
-
-* Set hibernate.query.factory_class=org.hibernate.hql.classic.ClassicQueryTranslatorFactory in
-  persistence.xml - OC4J uses an incompatible (old) version of antlr in toplink which causes 
-  hibernate to throw an exception (discussed here for Weblogic, but the same applies to OC4J - 
-  http://hibernate.org/250.html#A23).  You can also work around this by putting the hibernate 
-  jars in $ORACLE_HOME/j2ee/home/applib/
-  
-WebLogic 10.3
----------------------------
-Weblogic support requires some specific patches from Oracle/BEA so that their
-EJB3 support fuctions correctly.  Please refer to the Seam reference guide for 
-additional information.
-  
-- http://seamframework.org/Documentation
-  
-WebSphere 6.1.0.13 with EJB3 feature pack
----------------------------
-The instructions for integration with Websphere are fairly verbose.  Please 
-refer to the Seam reference guide for additional information.
-
-- http://seamframework.org/Documentation
+application servers with minimal changes in code and configuration files.

Modified: branches/enterprise/JBPAPP_5_0/examples/jee5/remoting/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jee5/remoting/build.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jee5/remoting/build.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -17,18 +17,11 @@
     <property name="seam.debug.lib" value="true"/>
     <property name="facelets.lib"   value="true"/>
     <property name="ajax4jsf.lib"   value="true"/>
-    <!-- add this for oc4j
-    <property name="jbpm.lib"   value="true"/>
-    -->
 
     <import file="../../build.xml"/>
 
     <fileset id="ear.lib.extras" dir="${seam.dir}">
         <include name="lib/common*.jar"/>
-
-        <!-- add this for oc4j
-        <include name="lib/antlr-*.jar"/>
-        -->
     </fileset>
        
 </project>

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-glassfish.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-glassfish.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-glassfish.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The JPA Example for GlassFish"/>
-    <property name="example.name"           value="jboss-seam-jpa"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-glassfish" />
-	<property name="dist.dir" value="dist-glassfish" />
-	<property name="exploded-archives.dir" value="exploded-archives-glassfish" />
-       
-    <!-- Libraries to include -->
-    <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="jboss-common-core.lib" value="true" />
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-    	<!-- Seam deps -->
-    	<include name="lib/javassist.jar"/>
-    	<include name="lib/dom4j.jar" />
-    	
-    	<!-- Hibernate and deps -->
-        <include name="lib/hibernate.jar"/>
-    	<include name="lib/hibernate-commons-annotations.jar"/>
-        <include name="lib/hibernate-annotations.jar"/>
-    	<include name="lib/hibernate-entitymanager.jar"/>
-    	<include name="lib/hibernate-validator.jar"/>
-        <include name="lib/asm.jar" />
-    	<include name="lib/cglib.jar"/>
-    	<include name="lib/antlr.jar" />
-    	<include name="lib/commons-logging.jar" />
-    	<include name="lib/commons-collections.jar" />
-    	
-    	<include name="lib/log4j.jar" />
-    </fileset>
-	
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="WEB-INF/classes/**/*" />
-	</fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss-embedded.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss-embedded.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss-embedded.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="tomcat.deploy" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The JPA Example for JBoss Embedded in Tomcat"/>
-    <property name="example.name"           value="jboss-seam-jpa"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-jboss" />
-	<property name="dist.dir" value="dist-jboss-embedded" />
-	<property name="exploded-archives.dir" value="exploded-archives-jboss-embedded" />
-       
-    <!-- Libraries to include -->
-    <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"/>
-
-    <import file="../build.xml"/>
-	
-	<fileset id="war.lib.extras" dir="${seam.dir}">
-		<include name="lib/jsf-api.jar" />
-		<include name="lib/jsf-impl.jar" />
-		<include name="lib/jstl.jar" />
-	</fileset>
-
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="jbosswar.deploy" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The JPA Example for JBoss 4.2.0.GA"/>
-    <property name="example.name"           value="jboss-seam-jpa"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-jboss" />
-	<property name="dist.dir" value="dist-jboss" />
-	<property name="exploded-archives.dir" value="exploded-archives-jboss" />
-       
-    <!-- Libraries to include -->
-    <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"/>
-
-    <import file="../build.xml"/>
-
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss405.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss405.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-jboss405.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The JPA Example for JBoss 4.0.5"/>
-    <property name="example.name"           value="jboss-seam-jpa"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-jboss" />
-	<property name="dist.dir" value="dist-jboss405" />
-	<property name="exploded-archives.dir" value="exploded-archives-jboss405" />
-       
-    <!-- Libraries to include -->
-    <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"/>
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-        <include name="lib/commons-beanutils.jar"/>
-        <include name="lib/commons-collections.jar"/>
-        <include name="lib/commons-digester.jar"/>
-        <include name="lib/commons-lang.jar"/>
-        <include name="lib/commons-logging.jar"/>
-        <include name="lib/jsf-impl.jar"/>
-        <include name="lib/jsf-api.jar"/>
-        <include name="lib/jstl.jar"/>
-        <include name="lib/el-api.jar"/>
-    </fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat55.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat55.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat55.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The JPA Example for plain Tomcat 5.5"/>
-    <property name="example.name"           value="jboss-seam-jpa"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-tomcat" />
-	<property name="dist.dir" value="dist-tomcat55" />
-	<property name="exploded-archives.dir" value="exploded-archives-tomcat55" />
-       
-    <!-- Libraries to include -->
-    <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" />
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-    	<!-- Seam deps -->
-    	<include name="lib/dom4j.jar" />
-    	<include name="lib/javassist.jar"/>
-    	
-    	<!-- Misc -->
-    	<include name="lib/commons-beanutils.jar"/>
-        <include name="lib/commons-collections.jar"/>
-        <include name="lib/commons-digester.jar"/>
-        <include name="lib/commons-lang.jar"/>
-        <include name="lib/commons-logging.jar"/>
-    	<include name="lib/jta.jar"/>
-    	
-    	<!-- JSF (and related) implementation -->
-    	<include name="lib/jsf-api.jar"/>
-    	<include name="lib/jsf-impl.jar"/>
-        <include name="lib/jstl.jar"/>
-    	<include name="lib/el-api.jar" />
-    	
-    	<!-- Hibernate and deps -->
-        <include name="lib/hibernate.jar"/>
-    	<include name="lib/hibernate-commons-annotations.jar"/>
-        <include name="lib/hibernate-annotations.jar"/>
-    	<include name="lib/hibernate-entitymanager.jar"/>
-    	<include name="lib/hibernate-validator.jar"/>
-    	<include name="lib/persistence-api.jar" />
-    	<include name="lib/asm.jar" />
-    	<include name="lib/cglib.jar"/>
-    	<include name="lib/antlr.jar" />
-    </fileset>
-
-	
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="META-INF/context.xml" />
-		<include name="WEB-INF/classes/log4j.xml" />
-	</fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat6.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat6.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-tomcat6.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The JPA Example for plain Tomcat 6.0"/>
-    <property name="example.name"           value="jboss-seam-jpa"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-tomcat" />
-	<property name="dist.dir" value="dist-tomcat6" />
-	<property name="exploded-archives.dir" value="exploded-archives-tomcat6" />
-       
-    <!-- Libraries to include -->
-    <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="jboss-common-core.lib" value="true" />
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-    	<include name="lib/commons-beanutils.jar"/>
-        <include name="lib/commons-collections.jar"/>
-        <include name="lib/commons-digester.jar"/>
-        <include name="lib/commons-lang.jar"/>
-        <include name="lib/commons-logging.jar"/>
-		<include name="lib/jsf-api.jar" />
-		<include name="lib/jsf-impl.jar" />
-		<include name="lib/jstl.jar" />
-		<include name="lib/dom4j.jar" />
-		<include name="lib/hibernate.jar" />
-		<include name="lib/hibernate-commons-annotations.jar" />
-		<include name="lib/hibernate-annotations.jar" />
-		<include name="lib/hibernate-entitymanager.jar" />
-		<include name="lib/hibernate-validator.jar" />
-		<include name="lib/javassist.jar" />
-		<include name="lib/persistence-api.jar" />
-		<include name="lib/cglib.jar" />
-		<include name="lib/jta.jar" />
-		<include name="lib/antlr.jar" />
-    	<include name="lib/asm.jar" />
-    </fileset>
-	
-	<fileset id="noejb.war.extras" dir="${resources.dir}">
-		<include name="META-INF/context.xml" />
-		<include name="WEB-INF/classes/log4j.xml" />
-	</fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic10.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic10.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic10.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-  <!-- Naming -->
-  <property name="Name" value="The JPA Example for WebLogic 10" />
-  <property name="example.name" value="jboss-seam-jpa" />
-
-  <!-- resources -->
-  <property name="resources.dir" value="resources-weblogic10" />
-  <property name="dist.dir" value="dist-weblogic10" />
-  <property name="exploded-archives.dir"
-    value="exploded-archives-weblogic10" />
-
-  <!-- Libraries to include -->
-  <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" />
-
-  <import file="../build.xml" />
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-      <!-- Seam deps -->
-      <include name="lib/dom4j.jar" />
-      <include name="lib/javassist.jar" />
-
-      <!-- Misc -->
-      <include name="lib/commons-beanutils.jar" />
-      <include name="lib/commons-digester.jar" />
-      <include name="lib/commons-collections.jar" />
-      <include name="lib/commons-logging.jar" />
-
-      <!-- Hibernate and deps -->
-      <include name="lib/hibernate.jar" />
-      <include name="lib/hibernate-commons-annotations.jar" />
-      <include name="lib/hibernate-annotations.jar" />
-      <include name="lib/hibernate-entitymanager.jar" />
-      <include name="lib/hibernate-validator.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}">
-    <include name="WEB-INF/classes/**/*" />
-  </fileset>
-
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic92.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic92.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-weblogic92.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-  <!-- Naming -->
-  <property name="Name" value="The JPA Example for WebLogic 9.2" />
-  <property name="example.name" value="jboss-seam-jpa" />
-
-  <!-- resources -->
-  <property name="resources.dir" value="resources-weblogic92" />
-  <property name="dist.dir" value="dist-weblogic92" />
-  <property name="exploded-archives.dir"
-    value="exploded-archives-weblogic92" />
-
-  <!-- Libraries to include -->
-  <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" />
-
-  <import file="../build.xml" />
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-      <!-- Seam deps -->
-      <include name="lib/dom4j.jar" />
-      <include name="lib/javassist.jar" />
-
-      <!-- Misc -->
-      <include name="lib/jta.jar" />
-      <include name="lib/commons-beanutils.jar" />
-      <include name="lib/commons-digester.jar" />
-      <include name="lib/commons-collections.jar" />
-      <include name="lib/commons-logging.jar" />
-      
-      <!-- JSF (and related) implementation -->
-      <include name="lib/jsf-api.jar" />
-      <include name="lib/jsf-impl.jar" />
-      <include name="lib/jstl.jar" />
-      <include name="lib/el-api.jar" />
-
-      <!-- Hibernate and deps -->
-      <include name="lib/hibernate.jar" />
-      <include name="lib/hibernate-commons-annotations.jar" />
-      <include name="lib/hibernate-annotations.jar" />
-      <include name="lib/hibernate-entitymanager.jar" />
-      <include name="lib/hibernate-validator.jar" />
-      <include name="lib/persistence-api.jar" />
-      <include name="lib/cglib.jar" />
-      <include name="lib/antlr.jar" />
-    </fileset>
-
-  <fileset id="noejb.war.extras" dir="${resources.dir}">
-    <include name="WEB-INF/classes/**/*" />
-  </fileset>
-
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere61.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere61.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere61.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-    <!-- Naming -->
-    <property name="Name"                   value="The JPA Example for WebSphere 6.1.0.13 + EJB3 FP"/>
-    <property name="example.name"           value="jboss-seam-jpa"/>
-
-    <!-- resources -->
-    <property name="resources.dir" value="resources-websphere61" />
-	<property name="dist.dir" value="dist-websphere61" />
-	<property name="exploded-archives.dir" value="exploded-archives-websphere61" />
-       
-    <!-- Libraries to include -->
-    <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" />
-
-    <import file="../build.xml"/>
-
-    <fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-        <!-- Seam deps -->
-        <include name="lib/dom4j.jar" />
-        <include name="lib/javassist.jar"/>
-        
-        <!-- Misc -->
-        <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" />  
-        
-        <!-- Hibernate and deps -->
-        <include name="lib/hibernate.jar"/>
-        <include name="lib/hibernate-commons-annotations.jar"/>
-        <include name="lib/hibernate-annotations.jar"/>
-        <include name="lib/hibernate-entitymanager.jar"/>
-        <include name="lib/hibernate-validator.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}">
-		<include name="WEB-INF/classes/**/*" />
-	</fileset>
-       
-</project>
-

Deleted: branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere7.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere7.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build-websphere7.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="JPA Booking" default="noejb.archive" basedir=".">
-
-	<!-- Naming -->
-	<property name="Name" value="The JPA Example for WebSphere 7" />
-	<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="exploded-archives.dir" value="exploded-archives-websphere7" />
-
-	<!-- Libraries to include -->
-	<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" />
-
-	<import file="../build.xml" />
-
-	<fileset id="noejb.war.lib.extras" dir="${seam.dir}">
-		<!-- Seam deps -->
-		<include name="lib/dom4j.jar" />
-		<include name="lib/javassist.jar" />
-
-		<!-- Misc -->
-		<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" />-->
-
-		<!-- Hibernate and deps -->
-		<include name="lib/hibernate.jar" />
-		<include name="lib/hibernate-commons-annotations.jar" />
-		<include name="lib/hibernate-annotations.jar" />
-		<include name="lib/hibernate-entitymanager.jar" />
-		<include name="lib/hibernate-validator.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}">
-		<include name="WEB-INF/classes/**/*" />
-	</fileset>
-
-</project>
-

Modified: branches/enterprise/JBPAPP_5_0/examples/jpa/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/build.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/build.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,88 +1,27 @@
 <?xml version="1.0"?>
 
-<project name="JPA Booking" default="jboss" basedir=".">
-
-   <target name="jboss" description="Build the JPA artifacts, and deploy to JBoss 4.2.0.GA">
-     	<ant antfile="build-jboss.xml"/>
-   </target>
-   
-   <target name="jboss-embedded" description="Build the JPA artifacts, and deploy to JBoss Embedded in Tomcat">
-      <ant antfile="build-jboss-embedded.xml"/>
-   </target>
+<project name="JPA Booking" default="jboss5" basedir=".">
 	
-   <target name="jboss-embedded.undeploy" description="Undeploy from JBoss Embedded in Tomcat">
-      <ant antfile="build-jboss-embedded.xml" target="tomcat.undeploy"/>
-   </target>
-	
-	<target name="jboss.undeploy" description="Undeploy JPA example from JBoss AS">
-	    <ant antfile="build-jboss.xml" target="jbosswar.undeploy"/>
-   </target>
-
    <target name="jboss5" description="Build the JPA artifacts, suitable for deployment to JBoss 5.0.0.GA">
      	<ant antfile="build-jboss5.xml"/>
    </target>
-
-   <target name="jboss405" description="Build the JPA artifacts, suitable for deployment to JBoss 4.0.5.GA">
-     	<ant antfile="build-jboss405.xml"/>
+    
+   <target name="jboss5.undeploy" description="Undeploy JPA example from JBoss AS">
+	    <ant antfile="build-jboss5.xml" target="jbosswar.undeploy"/>
    </target>
 
-   <target name="glassfish" description="Build the JPA artifacts, suitable for deployment to GlassFish V2">
-     	<ant antfile="build-glassfish.xml"/>
-   </target>
-
-   <target name="weblogic92" description="Build the JPA artifacts, suitable for deployment to WebLogic 9.2">
-     	<ant antfile="build-weblogic92.xml"/>
-   </target>
-   
-   <target name="weblogic10" description="Build the JPA artifacts, suitable for deployment to WebLogic 10">
-        <ant antfile="build-weblogic10.xml"/>
-   </target>
-
-   <target name="websphere61" description="Build the JPA artifacts, suitable for deployment to WebSphere 6.1.0.13 + EJB3 FP">
-     	<ant antfile="build-websphere61.xml"/>
-   </target>
-
-   <target name="websphere7" description="Build the JPA artifacts, suitable for deployment to WebSphere 7">
-     	<ant antfile="build-websphere7.xml"/>
-   </target>
-
-   <target name="tomcat55" description="Build the JPA artifacts, suitable for deployment to Tomcat 5.5">
-     	<ant antfile="build-tomcat55.xml"/>
-   </target>
-
-   <target name="tomcat6" description="Build the JPA artifacts, suitable for deployment to Tomcat 6.0">
-     	<ant antfile="build-tomcat6.xml"/>
-   </target>
-	
-	<target name="tomcat6.deploy" depends="tomcat6" description="Deploy to Tomcat 6.0">
-		<ant antfile="build-tomcat6.xml" target="tomcat.deploy"/>
-	</target>
-	
-	<target name="tomcat6.undeploy" description="Undeploy from Tomcat 6.0">
-		<ant antfile="build-tomcat6.xml" target="tomcat.undeploy"/>
-	</target>
-
    <target name="clean" description="Clean up the example">
-     	<ant antfile="build-jboss.xml" target="clean" />
-   	 	<ant antfile="build-jboss405.xml" target="clean" />
-    	<ant antfile="build-glassfish.xml" target="clean" />
-    	<ant antfile="build-weblogic92.xml" target="clean" />
-        <ant antfile="build-weblogic10.xml" target="clean" />
-    	<ant antfile="build-websphere61.xml" target="clean" />
-    	<ant antfile="build-websphere7.xml" target="clean" />
-    	<ant antfile="build-tomcat55.xml" target="clean" />
-    	<ant antfile="build-tomcat6.xml" target="clean" />
-        <ant antfile="build-jboss-embedded.xml" target="clean" />
+     	<ant antfile="build-jboss5.xml" target="clean" />
    </target>
 
-   <target name="all" depends="jboss, jboss405, glassfish, weblogic92,weblogic10, websphere61, websphere7, tomcat55, tomcat6"/>
+   <target name="all" depends="jboss5"/>
 
    <target name="test">
-      <ant antfile="build-jboss.xml" target="test" />
+      <ant antfile="build-jboss5.xml" target="test" />
    </target>
 	
 	<target name="archive">
-		<ant antfile="build-jboss.xml" target="noejb.archive" />
+		<ant antfile="build-jboss5.xml" target="noejb.archive" />
 	</target>
 
 </project>

Modified: branches/enterprise/JBPAPP_5_0/examples/jpa/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/jpa/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/jpa/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,84 +2,9 @@
 ================
 
 This is the Hotel Booking example implemented in Seam POJO and Hibernate JPA.
-It can be deployed in JBoss AS 4.x, WebLogic, GlassFish, Tomcat (both with and 
-without the EJB3 container).
 
-JBoss AS 4.2.0:
-  * Install JBoss AS 4.2.0 GA
-  * ant jboss
+Follow these steps:
+  * ant jboss5
   * Start JBoss AS 
   * Access the app at http://localhost:8080/jboss-seam-jpa/
-  * ant jboss.undeploy
-
-JBoss AS 4.0.5 (with or without EJB3):
-  * Install JBoss AS 4.0.5 with the default J2EE profile
-  * ant jboss405
-  * Deploy dist-jboss405/jboss-seam-jpa.war
-  * Start JBoss AS 
-  * Access the app at http://localhost:8080/jboss-seam-jpa/
-
-WebLogic 9.2:
-  * Install WebLogic 9.2
-  * ant weblogic92
-  * Start the WebLogic "examples" server
-  * Load the admin console http://localhost:7001/console/
-  * Deploy dist-weblogic92/jboss-seam-jpa.war
-  * Access the app at http://localhost:7001/jboss-seam-jpa/
-
-WebLogic 10.X:
-  * Install WebLogic 10.X
-  * Create an hsql datasource called 'seam-jpa-ds" (see reference guide)
-  * Deploy Weblogics jsf-1.2.war shared library for JSF 1.2 support. (see reference guide)
-  * ant weblogic10
-  * Start the WebLogic domain you created or the "examples" domain if installed.
-  * Load the admin console http://localhost:7001/console/
-  * Deploy dist-weblogic10/jboss-seam-jpa.war
-  * Access the app at http://localhost:7001/jboss-seam-jpa/
-  * See Weblogic reference guide chapter for full details.
-
-WebSphere 6.1:
-
-  * Install and run WebSphere 6.1
-  * 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
-  * Deploy dist-websphere61/jboss-seam-jpa.war and specify a context_root
-  * From the "Enterprise Applications" list select: "jboss-seam-jpa" --> "Manager Modules" --> "jboss-seam-jpa.war" --> "Classes loaded with application class loader first", and then Apply
-  * Start the application
-  * Access it at http://localhost:9080/context_root/index.html
-
-Tomcat with JBoss Embedded:
-  * Install Tomcat
-  * Install JBoss Embedded
-  * ant jboss-embedded
-  * Deploy dist-jboss-embedded/jboss-seam-jpa.war
-  * Start Tomcat
-  * Access the app at http://localhost:8080/jboss-seam-jpa/
-  
-Tomcat (5.5 or 6) without JBoss Embedded:
-  * Install Tomcat
-  * Copy lib/hsqldb.jar from this distribution into $TOMCAT_HOME/common/lib (Tomcat 5.5) or $TOMCAT_HOME/lib (Tomcat 6)
-  * ant tomcat55 or ant tomcat6
-  * Deploy dist-jboss/jboss-seam-jpa.war
-  * Start Tomcat
-  * Access the app at http://localhost:8080/jboss-seam-jpa/
-
-GlassFish:
-  * Install GlassFish V2
-  * ant glassfish
-  * Start GlassFish and the Embedded Derby Database
-  * Load the admin console http://localhost:4848/
-  * Deploy dist-glassfish/jboss-seam-jpa.war in the admin console (Applications > Web Applications)
-    or using the command $GLASSFISH_HOME/bin/asadmin deploy dist-glassfish/jboss-seam-jpa.war
-  * Access the app at http://localhost:8080/jboss-seam-jpa/
-
-NOTES FOR GLASSFISH USERS:
-  In order for the app to work out of the box with GlassFish, we have
-  used the Derby (i.e., Java DB) database in GlassFish. The included
-  WEB-INF/classes/GlassfishDerbyDialect.class is a special hack to get
-  around a Derby bug in GlassFish V2. You must use it as your Hibernate
-  dialect if you use Derby with GlassFish.
-  
-  However, we strongly recommend you to use a non-Derby data source if
-  possible (for example, HSQL is a much better embedded DB).
+  * ant jboss5.undeploy

Modified: branches/enterprise/JBPAPP_5_0/examples/mail/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/mail/build.xml	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/mail/build.xml	2009-07-14 12:06:14 UTC (rev 11289)
@@ -8,7 +8,6 @@
 	<!-- Libraries -->
 	<property name="seam.ui.lib" value="yes" />
 	<property name="seam.mail.lib" value="yes" />
-	<property name="deploy.meldware.mail" value="yes" />
 	<property name="seam.pdf.lib"    value="yes"/>
 	<property name="seam.excel.lib"    value="yes"/>
 	<property name="seam.debug.lib" value="yes" />

Modified: branches/enterprise/JBPAPP_5_0/examples/metawidget/booking/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/metawidget/booking/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/metawidget/booking/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -16,7 +16,7 @@
 
   ant explode
 
-This example runs on JBoss AS as an EAR or Tomcat with JBoss Embedded as a WAR.
+This example runs on JBoss AS as an EAR.
 
  example.name=booking
 

Modified: branches/enterprise/JBPAPP_5_0/examples/metawidget/dvdstore/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/metawidget/dvdstore/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/metawidget/dvdstore/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -3,8 +3,7 @@
 
 This example demonstrates the use of Seam with jBPM pageflow and business
 process management. It uses metawidget to dynamically generate the forms at
-runtime. The example runs on JBoss AS as an EAR and Tomcat with Embedded JBoss
-as a WAR.
+runtime. The example runs on JBoss AS as an EAR.
 
 example.name=dvdstore
 

Modified: branches/enterprise/JBPAPP_5_0/examples/metawidget/groovybooking/build.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/metawidget/groovybooking/build.properties	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/metawidget/groovybooking/build.properties	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,2 +1,2 @@
 # Uncomment when deploying to JBoss AS 5
-#loadPersistenceUnits=false
+loadPersistenceUnits=true

Modified: branches/enterprise/JBPAPP_5_0/examples/numberguess/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/numberguess/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/numberguess/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,7 +2,6 @@
 =========================
 
 This is a simple example for the Seam tutorial, demonstrating the use of
-jBPM-based page flow. It runs on both JBoss AS as an EAR and Tomcat with
-Embedded JBoss as an EAR.
+jBPM-based page flow. It runs on both JBoss AS as an EAR.
 
 example.name=numberguess

Modified: branches/enterprise/JBPAPP_5_0/examples/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,9 +1,7 @@
 Seam Example Applications
 =========================
 This directory contains the Seam example applications, which have all been
-tested on the latest release of JBoss 4.2. All but a few examples have been
-tested on Tomcat (running JDK 1.5), and some have been tested on other
-application servers. Consult the readme.txt file in each of the examples to
+tested on the latest release of JBoss EAP 5. Consult the readme.txt file in each of the examples to
 see which additional servers the example supports.
 
 Below is a list of examples with a brief description. The name of the example,
@@ -93,25 +91,17 @@
 These are general instructions for deploying Seam examples. Take a look at the 
 readme.txt in the example to see if there are any specific instructions.
 
-How to Build and Deploy an Example on JBoss AS
+How to Build and Deploy an Example on JBoss EAP
 ----------------------------------------------
 
-1. Download and unzip JBoss AS 4.2.3.GA from:
-   
-   http://labs.jboss.com/jbossas/downloads
-
-2. Make sure you have an up to date version of Seam: 
-
-   http://seamframework.org/Download
-
-3. Open the "build.properties" file at the root of the Seam distribution in
+1. Open the "build.properties" file at the root of the Seam distribution in
    your editor and change jboss.home to point to your JBoss AS directory
    (the examples are deployed to the default profile)
 
-4. (Optional) Build Seam by running "ant" the Seam root directory
+2. (Optional) Build Seam by running "ant" the Seam root directory
    Only required if you are working from an SVN checkout.
 
-5. Build and deploy the example by running the following command from the Seam
+3. Build and deploy the example by running the following command from the Seam
    "examples/${example.name}" directory:
    
    ant explode
@@ -124,10 +114,10 @@
 
    ant restart
 
-6. Start JBoss AS by typing "./run.sh" (on Linux/Unix) or "run" (on Windows) 
-   in the jboss-4.2.3.GA/bin directory
+4. Start JBoss AS by typing "./run.sh" (on Linux/Unix) or "run" (on Windows) 
+   in the jboss-eap-5/bin directory
 
-7. Point your web browser to:
+5. Point your web browser to:
 
    http://localhost:8080/seam-${example.name}
 
@@ -145,51 +135,6 @@
 NOTE: The examples use the HSQL database embedded in JBoss AS
 
 
-How to Build and Deploy the Example on Tomcat
----------------------------------------------
-
-1. Download and install Tomcat 6
-
-   NOTE: Due to a bug, you must install Tomcat to a directory
-   path with no spaces. The example does not work in a default
-   install of Tomcat.
-   
-2. Install Embedded JBoss as described in the "Configuration" chapter of the
-   Seam reference documentation. 
-   
-3. Make sure you have an up to date version of Seam: 
-
-   http://seamframework.org/Download
-
-4. Open the "build.properties" file at the root of the Seam distribution in
-   your editor and change tomcat.home to point to your Tomcat directory
-
-5. (Optional) Build Seam by running "ant" the Seam root directory
-   Only required if you are working from an SVN checkout.
-
-6. Build and deploy the example by running the following command from the Seam
-   "examples/${example.name}" directory:
-   
-   ant tomcat.deploy
-   
-   To undeploy the example, run:
-
-   ant tomcat.undeploy
-
-   To redeploy/restart the deployed application, run:
-
-   ant tomcat.deploy
-
-7. Start Tomcat
-
-8. Point your web browser to:
-
-   http://localhost:8080/jboss-seam-${example.name}
-   
-   Note that examples deployed to Tomcat use the context path prefix
-   jboss-seam- rather than seam- like with the JBoss AS deployment.
-
-   
 Running The TestNG Tests
 ------------------------
 

Modified: branches/enterprise/JBPAPP_5_0/examples/registration/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/registration/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/registration/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,6 +2,6 @@
 =========================
 
 This is a trivial example for the Seam tutorial. It runs on both JBoss AS as an
-EAR and Tomcat with Embedded JBoss as a WAR.
+EAR.
 
 example.name=registration   

Modified: branches/enterprise/JBPAPP_5_0/examples/remoting/chatroom/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/remoting/chatroom/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/remoting/chatroom/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,6 +2,6 @@
 ==============================
 
 This example shows using Seam Remoting to subscribe and publish messages to JMS. 
-It runs on JBoss AS as an EAR and Tomcat with Embedded JBoss as a WAR.
+It runs on JBoss AS as an EAR.
 
 example.name=chatroom

Modified: branches/enterprise/JBPAPP_5_0/examples/remoting/helloworld/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/remoting/helloworld/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/remoting/helloworld/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -2,6 +2,6 @@
 ================================
 
 This example is a trivial example of Seam Remoting.  It runs on JBoss AS as an
-EAR and Tomcat with Embedded JBoss as a WAR.
+EAR.
 
 example.name=helloworld

Modified: branches/enterprise/JBPAPP_5_0/examples/seambay/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/seambay/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/seambay/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,8 +1,6 @@
 SeamBay Example
 ===============
 
-This example shows Seam/WS integration.  It runs on JBoss AS as an EAR and
-JBoss with Embedded JBoss as a WAR.
+This example shows Seam/WS integration.  It runs on JBoss AS as an EAR.
 
 Visit http://localhost:8080/seam-bay on JBoss AS
-Visit http://localhost:8080/jboss-seam-bay on Tomcat

Modified: branches/enterprise/JBPAPP_5_0/examples/seamdiscs/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/seamdiscs/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/seamdiscs/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,11 +1,9 @@
 SeamDiscs Example
 =================================
 
-This example runs on JBoss AS 4.2.2.GA or later as an EAR and Tomcat with
-Embedded JBoss as a WAR.
+This example runs on JBoss AS as an EAR.
 
-Visit http://localhost:8080/seam-discs (on JBoss AS) or 
-http://localhost:8080/jboss-seam-discs (on Tomcat).
+Visit http://localhost:8080/seam-discs (on JBoss AS).
 
 The seamdiscs example is a simple example built using the Seam Application 
 Framework which allows you to record your favourite albums and artists.  It 

Modified: branches/enterprise/JBPAPP_5_0/examples/seampay/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/seampay/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/seampay/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,8 +1,6 @@
 SeamPay Example
 ===============
 
-This example shows Seam's EJB3 timer support.  It runs on JBoss AS as an EAR
-and Tomcat with Embedded JBoss as a WAR.
+This example shows Seam's EJB3 timer support.  It runs on JBoss AS as an EAR.
 
-Visit http://localhost:8080/seam-pay on JBoss AS
-Visit http://localhost:8080/jboss-seam-pay on Tomcat
+Visit http://localhost:8080/seam-pay on JBoss AS
\ No newline at end of file

Modified: branches/enterprise/JBPAPP_5_0/examples/seamspace/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/seamspace/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/seamspace/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,8 +1,6 @@
 SeamSpace Example
 ===============
 
-This example demonstrates Seam Security.  It runs on JBoss AS as an EAR and
-Tomcat with Embedded JBoss as a WAR.
+This example demonstrates Seam Security.  It runs on JBoss AS as an EAR.
 
-Visit http://localhost:8080/seam-space on JBoss AS
-Visit http://localhost:8080/jboss-seam-space on Tomcat
+Visit http://localhost:8080/seam-space on JBoss AS
\ No newline at end of file

Modified: branches/enterprise/JBPAPP_5_0/examples/spring/readme.txt
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/spring/readme.txt	2009-07-14 09:57:47 UTC (rev 11288)
+++ branches/enterprise/JBPAPP_5_0/examples/spring/readme.txt	2009-07-14 12:06:14 UTC (rev 11289)
@@ -1,8 +1,8 @@
 Spring Example
 ===============
 
-This example shows Seam/Spring integration. Currently it runs on JBoss AS 4.2
-as a WAR. It is deployed using the command "ant jbosswar" and undeployed using
+This example shows Seam/Spring integration. Currently it runs on JBoss AS as a WAR.
+ It is deployed using the command "ant jbosswar" and undeployed using
 the command "ant jbosswar.undeploy".
 
 Visit http://localhost:8080/jboss-seam-spring




More information about the seam-commits mailing list